codegen: Assign to temp varable when passing a nullable struct argument

Assign possible (*expr) to a temp variable to ensure copying the struct.

Fixes bug 656693.

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 2a2ee263910a3406d02dc650a06613e09524aeb4..b6e2ce14d0039213a741126459ae574c93dfa072 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -4388,10 +4388,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        // we already use a reference for arguments of ref, out, and nullable parameters
                        if (!(unary != null && (unary.operator == UnaryOperator.OUT || unary.operator == UnaryOperator.REF)) && !type.nullable) {
                                var cunary = cexpr as CCodeUnaryExpression;
-                               if (cunary != null && cunary.operator == CCodeUnaryOperator.POINTER_INDIRECTION) {
-                                       // *expr => expr
-                                       return cunary.inner;
-                               } else if (cexpr is CCodeIdentifier || cexpr is CCodeMemberAccess) {
+                               if (cexpr is CCodeIdentifier || cexpr is CCodeMemberAccess) {
                                        return new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, cexpr);
                                } else {
                                        // if cexpr is e.g. a function call, we can't take the address of the expression

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0beb76f063b8ca0a8fa6ae4ffb0c8f1f81fcf816..d1b1491f9bf6f45976717042c8d2fe842e59f1c7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -72,6 +72,7 @@ TESTS = \
        structs/bug651441.vala \
        structs/bug654646.vala \
        structs/bug654753.vala \
+       structs/bug656693.vala \
        delegates/delegates.vala \
        delegates/bug539166.vala \
        delegates/bug595610.vala \

diff --git a/tests/structs/bug656693.vala b/tests/structs/bug656693.vala
new file mode 100644 (file)
index 0000000..86d90e5
--- /dev/null
+++ b/tests/structs/bug656693.vala
@@ -0,0 +1,13 @@
+struct Foo {
+       int bar;
+}
+
+void baz (Foo foo) {
+       foo.bar = 3;
+}
+
+void main () {
+       Foo? foo = Foo ();
+       baz (foo);
+       assert (foo.bar == 0);
+}