From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 18 Apr 2021 19:02:21 +0000 (+0200)
Subject: codegen: Apply gconstpointer to gpointer cast to GenericType only
X-Git-Tag: 0.53.1~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edc0b532d9469d21fdd91f1b0d0e4d0bcb4045d5;p=thirdparty%2Fvala.git

codegen: Apply gconstpointer to gpointer cast to GenericType only
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 1fe5e1a37..2d24faba1 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -4791,15 +4791,17 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 			}
 
 			CCodeExpression cifnull;
-			if (type.type_symbol != null) {
-				cifnull = new CCodeConstant ("NULL");
-			} else {
+			if (type is GenericType) {
 				// the value might be non-null even when the dup function is null,
 				// so we may not just use NULL for type parameters
 
 				// cast from gconstpointer to gpointer as methods in
 				// generic classes may not return gconstpointer
 				cifnull = new CCodeCastExpression (cexpr, get_ccode_name (pointer_type));
+			} else if (type.type_symbol != null) {
+				cifnull = new CCodeConstant ("NULL");
+			} else {
+				cifnull = cexpr;
 			}
 
 			if (is_ref_function_void (type)) {