]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
codegen: CCodeBaseModule.get_type_id_expression () won't return null
authorRico Tzschichholz <ricotz@ubuntu.com>
Fri, 19 Feb 2021 15:29:24 +0000 (16:29 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Fri, 19 Feb 2021 15:29:24 +0000 (16:29 +0100)
codegen/valaccodebasemodule.vala

index 2b8132ee52fd39b238ac1629d0cd9f9c05860745..928be5111f81974e8631b8b7d1ee0d0522595317 100644 (file)
@@ -5805,13 +5805,9 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                } else {
                        CCodeFunctionCall ccheck;
                        if (type.type_symbol == null || type.type_symbol.external_package) {
-                               var type_id = get_type_id_expression (type);
-                               if (type_id == null) {
-                                       return new CCodeInvalidExpression ();
-                               }
                                ccheck = new CCodeFunctionCall (new CCodeIdentifier ("G_TYPE_CHECK_INSTANCE_TYPE"));
                                ccheck.add_argument ((CCodeExpression) ccodenode);
-                               ccheck.add_argument (type_id);
+                               ccheck.add_argument (get_type_id_expression (type));
                        } else {
                                ccheck = new CCodeFunctionCall (new CCodeIdentifier (get_ccode_type_check_function (type.type_symbol)));
                                ccheck.add_argument ((CCodeExpression) ccodenode);