From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Fri, 19 Feb 2021 15:29:24 +0000 (+0100)
Subject: codegen: CCodeBaseModule.get_type_id_expression () won't return null
X-Git-Tag: 0.51.3~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f32f45c839efc2cffc5aaf8690739fae0241c7ee;p=thirdparty%2Fvala.git

codegen: CCodeBaseModule.get_type_id_expression () won't return null
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 2b8132ee5..928be5111 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -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);