codegen: Don't pass CCodeCastExpression to NULL-aware free macro

This resulted in invalid C code:
    error: lvalue required as left operand of assignment

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

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 5e13088589b0c5cf81768a9582267fa269826351..3a07377f39fc23bf7712e8574bb17c46a21ac48e 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -3620,6 +3620,11 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                                cfile.add_type_declaration (new CCodeMacroReplacement.with_expression ("%s(var)".printf (free0_func), macro));
                        }
 
+                       // FIXME this breaks in our macro, so this should not happen
+                       if (cvar is CCodeCastExpression) {
+                               cvar = ((CCodeCastExpression) cvar).inner;
+                       }
+
                        ccall = new CCodeFunctionCall (new CCodeIdentifier (free0_func));
                        ccall.add_argument (cvar);
                        return ccall;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index bf88efc4113ac0225ec893c0ea0f9259ed61c8a1..f96352d757960592808e850478cd6e342904df26 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -368,6 +368,7 @@ TESTS = \
        objects/interface-property-override.vala \
        objects/interface-virtual-override.vala \
        objects/member-initializer-base-properties.vala \
+       objects/member-initializer-property.vala \
        objects/member-initializer-property-owned-setter.vala \
        objects/methods.vala \
        objects/paramspec.vala \

diff --git a/tests/objects/member-initializer-property.vala b/tests/objects/member-initializer-property.vala
new file mode 100644 (file)
index 0000000..cd71ed0
--- /dev/null
+++ b/tests/objects/member-initializer-property.vala
@@ -0,0 +1,15 @@
+class Baz {
+}
+
+class Bar : Baz {
+}
+
+class Foo {
+       public Baz baz { get; set; }
+}
+
+void main() {
+       var foo = new Foo () {
+               baz = new Bar ()
+       };
+}