codegen: Fix foreach on inline allocated arrays

Fixes bug 652549.

diff --git a/codegen/valaccodecontrolflowmodule.vala b/codegen/valaccodecontrolflowmodule.vala
index b939bed1cc24ec0e4c2d7a194191bd92b754fbb0..46c8ed13fdbeffbe120c84e9fb9ce4a2ae87a91f 100644 (file)
--- a/codegen/valaccodecontrolflowmodule.vala
+++ b/codegen/valaccodecontrolflowmodule.vala
@@ -222,11 +222,12 @@ public abstract class Vala.CCodeControlFlowModule : CCodeMethodModule {
                ccode.open_block ();
 
                var collection_backup = stmt.collection_variable;
-               var collection_type = collection_backup.variable_type.copy ();
+               var collection_type = collection_backup.variable_type;
 
                var array_type = collection_type as ArrayType;
                if (array_type != null) {
                        // avoid assignment issues
+                       array_type.inline_allocated = false;
                        array_type.fixed_length = false;
                }
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a4b1beddd80a091b3f00b98b99988999bc102732..9819401e161a89d524bbd366711a2d5a97c4d859 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -47,6 +47,7 @@ TESTS = \
        control-flow/foreach.vala \
        control-flow/switch.vala \
        control-flow/sideeffects.vala \
+       control-flow/bug652549.vala \
        enums/enums.vala \
        structs/structs.vala \
        structs/gvalue.vala \

diff --git a/tests/control-flow/bug652549.vala b/tests/control-flow/bug652549.vala
new file mode 100644 (file)
index 0000000..ac801af
--- /dev/null
+++ b/tests/control-flow/bug652549.vala
@@ -0,0 +1,6 @@
+void main () {
+       int foo[2] = {1,1};
+       foreach (var bar in foo) {
+               assert (bar == 1);
+       }
+}

diff --git a/vala/valaforeachstatement.vala b/vala/valaforeachstatement.vala
index 2ce466d9557f2e8aa8333c89fe485e44e5b5ef6c..a518a2beedc23b0698986a8c5d033c5eef385ebc 100644 (file)
--- a/vala/valaforeachstatement.vala
+++ b/vala/valaforeachstatement.vala
@@ -374,7 +374,7 @@ public class Vala.ForeachStatement : Block {
 
                context.analyzer.current_symbol = context.analyzer.current_symbol.parent_symbol;
 
-               collection_variable = new LocalVariable (collection_type, "%s_collection".printf (variable_name));
+               collection_variable = new LocalVariable (collection_type.copy (), "%s_collection".printf (variable_name));
 
                add_local_variable (collection_variable);
                collection_variable.active = true;