]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
vala: Don't process initializer of parameter if error is set 27fc5a83788c29a684241dd424dcb179e78b5e49
authorRico Tzschichholz <ricotz@ubuntu.com>
Tue, 18 Feb 2020 15:20:42 +0000 (16:20 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Tue, 18 Feb 2020 16:19:39 +0000 (17:19 +0100)
This caused criticals like:

  vala_data_type_compatible: assertion 'self != NULL' failed
  vala_code_node_to_string: assertion 'self != NULL' failed

tests/Makefile.am
tests/semantic/parameter-default-invalid.test [new file with mode: 0644]
vala/valaparameter.vala

index 69456f5bd762d5833b6b225d43288d793e0fddb1..98c5e5faff14dbbff40f0ff29bd5a9fcb453a51c 100644 (file)
@@ -823,6 +823,7 @@ TESTS = \
        semantic/objectcreation-non-public-constructor.test \
        semantic/objectcreation-unsupported-type.test \
        semantic/parameter-accessibility.test \
+       semantic/parameter-default-invalid.test \
        semantic/parameter-default-type.test \
        semantic/parameter-out-default.test \
        semantic/parameter-params.test \
diff --git a/tests/semantic/parameter-default-invalid.test b/tests/semantic/parameter-default-invalid.test
new file mode 100644 (file)
index 0000000..987bc37
--- /dev/null
@@ -0,0 +1,7 @@
+Invalid Code
+
+void foo (int bar = G) {
+}
+
+void main () {
+}
index e447612d36b712c37e9c73b5d4bfaa165f1609e7..052b06ce83a335aa4a4f88e8fdc80c31abad7378 100644 (file)
@@ -176,7 +176,7 @@ public class Vala.Parameter : Variable {
                        }
                }
 
-               if (initializer != null) {
+               if (initializer != null && !initializer.error) {
                        if (initializer is NullLiteral
                            && !variable_type.nullable
                            && direction != ParameterDirection.OUT) {