Fix ellipsis parameter position in generated methods

Fixes bug 620673.

diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 003e17a09b4a94c9ace30aa6a2dc946daa075805..0df172f5f973b42469c0ade5fd592d466879c2c0 100644 (file)
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -788,9 +788,9 @@ public class Vala.CCodeMethodModule : CCodeStructModule {
                        param.ccodenode = new CCodeFormalParameter.with_ellipsis ();
                }
 
-               cparam_map.set (get_param_pos (param.cparameter_position), (CCodeFormalParameter) param.ccodenode);
+               cparam_map.set (get_param_pos (param.cparameter_position, param.ellipsis), (CCodeFormalParameter) param.ccodenode);
                if (carg_map != null && !param.ellipsis) {
-                       carg_map.set (get_param_pos (param.cparameter_position), get_variable_cexpression (param.name));
+                       carg_map.set (get_param_pos (param.cparameter_position, param.ellipsis), get_variable_cexpression (param.name));
                }
        }
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dcaf3f029b4c8ffd7d8679d1ec03b672be30f432..e09841a0ce0d920584758a131e042a0d449572c4 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,6 +32,7 @@ TESTS = \
        methods/bug598738.vala \
        methods/bug599892.vala \
        methods/bug613483.vala \
+       methods/bug620673.vala \
        control-flow/break.vala \
        control-flow/expressions-conditional.vala \
        control-flow/for.vala \

diff --git a/tests/methods/bug620673.vala b/tests/methods/bug620673.vala
new file mode 100644 (file)
index 0000000..a305a3e
--- /dev/null
+++ b/tests/methods/bug620673.vala
@@ -0,0 +1,5 @@
+void foo (int bar, ...) throws Error {
+}
+
+void main () {
+}
\ No newline at end of file