[vala/0.46] vala: Don't process initializer of parameter if error is set



commit d82434487e4a0949de92c902f2edf68191582587
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Tue Feb 18 16:20:42 2020 +0100

    vala: Don't process initializer of parameter if error is set
    
    This caused criticals like:
    
      vala_data_type_compatible: assertion 'self != NULL' failed
      vala_code_node_to_string: assertion 'self != NULL' failed

 tests/Makefile.am                             | 1 +
 tests/semantic/parameter-default-invalid.test | 7 +++++++
 vala/valaparameter.vala                       | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2c24e9633..16812f4c0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -800,6 +800,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
index 000000000..987bc376c
--- /dev/null
+++ b/tests/semantic/parameter-default-invalid.test
@@ -0,0 +1,7 @@
+Invalid Code
+
+void foo (int bar = G) {
+}
+
+void main () {
+}
diff --git a/vala/valaparameter.vala b/vala/valaparameter.vala
index 3f382595a..25fe9f4c0 100644
--- a/vala/valaparameter.vala
+++ b/vala/valaparameter.vala
@@ -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) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]