From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 18 May 2020 07:31:41 +0000 (+0200)
Subject: codegen: Use loop index instead of get_ccode_pos() for ellipsis parameter
X-Git-Tag: 0.46.10~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d14769c92ad4037ec7d95ff524899e9350252cc3;p=thirdparty%2Fvala.git

codegen: Use loop index instead of get_ccode_pos() for ellipsis parameter

Otherwise this will cause an index clash resulting in loosing the first
variable list parameter.

Regression of b1cb7036bee1f21e98e93ac34b31a95eeed32815

Fixes https://gitlab.gnome.org/GNOME/vala/issues/995
---

diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index 216012594..2b7cefb4a 100644
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -482,7 +482,7 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
 				}
 			}
 
-			arg_pos = get_param_pos (param != null ? get_ccode_pos (param) : i, ellipsis);
+			arg_pos = get_param_pos (param != null && !ellipsis ? get_ccode_pos (param) : i, ellipsis);
 			carg_map.set (arg_pos, cexpr);
 
 			if (arg is NamedArgument && ellipsis) {