vala: Correctly perform compatibility check of array length-type

Regression of 36671ae5def89b46384e627a467247c834948254

https://gitlab.gnome.org/GNOME/vala/issues/607

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 76b93f2c34845b5ce99846eec784b6e972d0a528..7f10b16065163c6b576c2b3e509e8c217066ce92 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -70,6 +70,7 @@ TESTS = \
        arrays/class-field-length-cname.vala \
        arrays/field-global-length-cname.vala \
        arrays/struct-field-length-cname.vala \
+       arrays/incompatible-integer-elements.test \
        chainup/base-class-invalid.test \
        chainup/base-enum-invalid.test \
        chainup/base-invalid.test \

diff --git a/tests/arrays/incompatible-integer-elements.test b/tests/arrays/incompatible-integer-elements.test
new file mode 100644 (file)
index 0000000..f2bfc93
--- /dev/null
+++ b/tests/arrays/incompatible-integer-elements.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+       uint8?[] foo = new int?[13];
+}

diff --git a/vala/valaarraytype.vala b/vala/valaarraytype.vala
index 8265a8027055c1fa4fa30148b57b14bbacf0b069..84522ca4ce47e3ca1cea50711479899d446c306d 100644 (file)
--- a/vala/valaarraytype.vala
+++ b/vala/valaarraytype.vala
@@ -235,12 +235,12 @@ public class Vala.ArrayType : ReferenceType {
                        return false;
                }
 
-               if (element_type.compatible (target_array_type.element_type)
-                   && target_array_type.element_type.compatible (element_type)) {
-                       return true;
+               if (!length_type.compatible (target_array_type.length_type)) {
+                       return false;
                }
 
-               if (length_type.compatible (target_array_type.length_type)) {
+               if (element_type.compatible (target_array_type.element_type)
+                   && target_array_type.element_type.compatible (element_type)) {
                        return true;
                }