codegen: Update outdated array _size_ variable of captured local-variable

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1090

diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index 2c5be10c3071cc3639e1771480556e89da89dfb2..09c1ccb1723968516fa37d2852626f4533d508c0 100644 (file)
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -826,9 +826,8 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
                        ccode.add_assignment (get_array_length_cexpression (ma.inner, 1), temp_ref);
 
                        var array_var = ma.inner.symbol_reference;
-                       var array_local = array_var as LocalVariable;
                        if (array_var != null && array_var.is_internal_symbol ()
-                           && ((array_var is LocalVariable && !array_local.captured) || array_var is Field)) {
+                           && (array_var is LocalVariable || array_var is Field)) {
                                ccode.add_assignment (get_array_size_cvalue (ma.inner.target_value), temp_ref);
                        }
 
@@ -905,9 +904,8 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
                                if (param != null && get_ccode_array_length (param) && param.variable_type is ArrayType
                                    && !((ArrayType) param.variable_type).fixed_length && ((ArrayType) param.variable_type).rank == 1) {
                                        unowned Symbol? array_var = unary.inner.symbol_reference;
-                                       unowned LocalVariable? array_local = array_var as LocalVariable;
                                        if (array_var != null && array_var.is_internal_symbol ()
-                                           && ((array_local != null && !array_local.captured) || array_var is Field)) {
+                                           && (array_var is LocalVariable || array_var is Field)) {
                                                ccode.add_assignment (get_array_size_cvalue (unary.inner.target_value), get_array_length_cvalue (unary.inner.target_value, 1));
                                        }
                                }

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3be19f407ac597b46f354865b61fe4afa89872e8..168a3fe6ebb095dac139312931fcd594844e679f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -103,6 +103,8 @@ TESTS = \
        arrays/struct-namespaced-initializer.vala \
        arrays/incompatible-integer-elements.test \
        arrays/resize.vala \
+       arrays/resize-local-size.vala \
+       arrays/resize-local-size-captured.vala \
        arrays/resize-unowned-invalid.test \
        arrays/resize-unowned-invalid-2.test \
        arrays/resize-unowned-invalid-3.test \
@@ -138,6 +140,7 @@ TESTS = \
        methods/iterator.vala \
        methods/parameter-fixed-array-initializer.vala \
        methods/parameter-ref-array-resize.vala \
+       methods/parameter-ref-array-resize-captured.vala \
        methods/prepostconditions.vala \
        methods/prepostconditions-captured.vala \
        methods/postconditions.vala \

diff --git a/tests/arrays/resize-local-size-captured.vala b/tests/arrays/resize-local-size-captured.vala
new file mode 100644 (file)
index 0000000..6e23d71
--- /dev/null
+++ b/tests/arrays/resize-local-size-captured.vala
@@ -0,0 +1,14 @@
+delegate void FooFunc ();
+
+void main () {
+       int[] a = new int[10 * 1024 * 1024];
+
+       FooFunc func = () => {
+               a.resize (1);
+       };
+       func ();
+
+       for (int i = 1; i < 10 * 1024 * 1024; i++) {
+               a += 4711;
+       }
+}

diff --git a/tests/arrays/resize-local-size.vala b/tests/arrays/resize-local-size.vala
new file mode 100644 (file)
index 0000000..0552201
--- /dev/null
+++ b/tests/arrays/resize-local-size.vala
@@ -0,0 +1,9 @@
+void main() {
+       int[] a = new int[10 * 1024 * 1024];
+
+       a.resize (1);
+
+       for (int i = 1; i < 10 * 1024 * 1024; i++) {
+               a += 4711;
+       }
+}

diff --git a/tests/methods/parameter-ref-array-resize-captured.vala b/tests/methods/parameter-ref-array-resize-captured.vala
new file mode 100644 (file)
index 0000000..19fd639
--- /dev/null
+++ b/tests/methods/parameter-ref-array-resize-captured.vala
@@ -0,0 +1,18 @@
+delegate void FooFunc ();
+
+void foo (ref int[] a) {
+       a = new int[1];
+}
+
+void main() {
+       int[] a = new int[10 * 1024 * 1024];
+
+       FooFunc func = () => {
+               foo (ref a);
+       };
+       func ();
+
+       for (int i = 1; i < 10 * 1024 * 1024; i++) {
+               a += 4711;
+       }
+}