codegen: Apply gconstpointer to gpointer cast to GenericType only

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 7d06fde1f64dd573153917069a2dd3d5f72a574b..4be1d2135fac52dc61159e9b4dc2d74d33efbfba 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -4708,15 +4708,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)) {