From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 17 Mar 2020 14:26:36 +0000 (+0100)
Subject: codegen: Use correctly typed array-length variable for delegate invocation
X-Git-Tag: 0.48.2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76ba3c3a6bb7f304bccf2bd03176101a72d260ae;p=thirdparty%2Fvala.git

codegen: Use correctly typed array-length variable for delegate invocation
---

diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index 17df1cda4..07ec2df6c 100644
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -608,7 +608,8 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
 
 					append_array_length (expr, len_call);
 				} else if (get_ccode_array_length (deleg)) {
-					var temp_var = get_temp_variable (array_type.length_type, true, null, true);
+					var length_ctype = get_ccode_array_length_type (deleg) ?? get_ccode_array_length_type (array_type);
+					var temp_var = get_temp_variable (new CType (length_ctype, "0"), true, null, true);
 					var temp_ref = get_variable_cexpression (temp_var.name);
 
 					emit_temp_var (temp_var);