vala: Inline-allocated array can't be instantiated with creation expression

This generalizes 0554ed7ad9cefe0f56e53dc00be88488dfa788bf

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 036aff1f5bf6fe4a0ec180d62423063bfdb30381..c19df41e4a4a3096c88f0f0127123432295ac544 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -83,6 +83,7 @@ TESTS = \
        arrays/fixed-length-non-const.test \
        arrays/fixed-length-resize-invalid.test \
        arrays/inline-field.test \
+       arrays/inline-local-instantiation.test \
        arrays/inline-local-variable.test \
        arrays/inline-parameter.test \
        arrays/inline-struct-field.test \

diff --git a/tests/arrays/inline-local-instantiation.test b/tests/arrays/inline-local-instantiation.test
new file mode 100644 (file)
index 0000000..329b819
--- /dev/null
+++ b/tests/arrays/inline-local-instantiation.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+       int foo[] = new int[1];
+}

diff --git a/vala/valaassignment.vala b/vala/valaassignment.vala
index abeca56ddfc2b0f74c19db79d645f7549bfb4ee0..fdf73826748486e9e01b1917d9d72e8c143f23b5 100644 (file)
--- a/vala/valaassignment.vala
+++ b/vala/valaassignment.vala
@@ -316,9 +316,9 @@ public class Vala.Assignment : Expression {
                        } else if (ma.symbol_reference is Variable) {
                                unowned Variable variable = (Variable) ma.symbol_reference;
                                unowned ArrayType? variable_array_type = variable.variable_type as ArrayType;
-                               if (variable_array_type != null && variable_array_type.fixed_length
+                               if (variable_array_type != null && variable_array_type.inline_allocated
                                    && right is ArrayCreationExpression && ((ArrayCreationExpression) right).initializer_list == null) {
-                                       Report.warning (source_reference, "Arrays with fixed length don't require an explicit instantiation");
+                                       Report.warning (source_reference, "Inline allocated arrays don't require an explicit instantiation");
                                        ((Block) parent_node.parent_node).replace_statement ((Statement) parent_node, new EmptyStatement (source_reference));
                                        return true;
                                }

diff --git a/vala/valafield.vala b/vala/valafield.vala
index 25eec89f4679177b4fe8c0f9287cabf0abcc619e..c7201d02e46e5cc0d802f156b4b4976021dec14e 100644 (file)
--- a/vala/valafield.vala
+++ b/vala/valafield.vala
@@ -117,9 +117,9 @@ public class Vala.Field : Variable, Lockable {
                }
 
                unowned ArrayType? variable_array_type = variable_type as ArrayType;
-               if (variable_array_type != null && variable_array_type.fixed_length
+               if (variable_array_type != null && variable_array_type.inline_allocated
                    && initializer is ArrayCreationExpression && ((ArrayCreationExpression) initializer).initializer_list == null) {
-                       Report.warning (source_reference, "Arrays with fixed length don't require an explicit instantiation");
+                       Report.warning (source_reference, "Inline allocated arrays don't require an explicit instantiation");
                        initializer = null;
                }
 

diff --git a/vala/valalocalvariable.vala b/vala/valalocalvariable.vala
index 2d6f7188bc7a4c62039cc5d1add633e3cc39d72c..64e16325b6926303047e28ae743d6d51e8340d1f 100644 (file)
--- a/vala/valalocalvariable.vala
+++ b/vala/valalocalvariable.vala
@@ -161,9 +161,9 @@ public class Vala.LocalVariable : Variable {
                }
 
                unowned ArrayType? variable_array_type = variable_type as ArrayType;
-               if (variable_array_type != null && variable_array_type.fixed_length
+               if (variable_array_type != null && variable_array_type.inline_allocated
                    && initializer is ArrayCreationExpression && ((ArrayCreationExpression) initializer).initializer_list == null) {
-                       Report.warning (source_reference, "Arrays with fixed length don't require an explicit instantiation");
+                       Report.warning (source_reference, "Inline allocated arrays don't require an explicit instantiation");
                        initializer = null;
                }