Avoid unnecessary copies when using the coalescing operator

Fixes bug 661985

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d89abfe7566e8ddba3ec8ea40053e515e9d1176..f8f882ca19823b2769d82050bf974773d9b32bbe 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -65,6 +65,7 @@ TESTS = \
        control-flow/sideeffects.vala \
        control-flow/bug639482.vala \
        control-flow/bug652549.vala \
+       control-flow/bug661985.vala \
        control-flow/bug665904.vala \
        control-flow/bug691514.vala     \
        enums/enums.vala \

diff --git a/tests/control-flow/bug661985.vala b/tests/control-flow/bug661985.vala
new file mode 100644 (file)
index 0000000..649af7d
--- /dev/null
+++ b/tests/control-flow/bug661985.vala
@@ -0,0 +1,7 @@
+void main () {
+       string foo = "foo";
+       void* foop = foo;
+       unowned string bar = foo ?? "bar";
+       void* barp = bar;
+       assert (foop == barp);
+}

diff --git a/vala/valabinaryexpression.vala b/vala/valabinaryexpression.vala
index 19766e12ff85327ca2a33b05a718f495df49a087..9c1ef4c984747137a526528657172b135be5bc9f 100644 (file)
--- a/vala/valabinaryexpression.vala
+++ b/vala/valabinaryexpression.vala
@@ -194,7 +194,12 @@ public class Vala.BinaryExpression : Expression {
                }
 
                if (operator == BinaryOperator.COALESCE) {
-                       var local = new LocalVariable (null, get_temp_name (), left, source_reference);
+                       if (!left.check (context)) {
+                               error = true;
+                               return false;
+                       }
+                       
+                       var local = new LocalVariable (left.value_type != null ? left.value_type.copy () : null, get_temp_name (), left, source_reference);
                        var decl = new DeclarationStatement (local, source_reference);
 
                        var right_stmt = new ExpressionStatement (new Assignment (new MemberAccess.simple (local.name, right.source_reference), right, AssignmentOperator.SIMPLE, right.source_reference), right.source_reference);
@@ -220,19 +225,10 @@ public class Vala.BinaryExpression : Expression {
                                return false;
                        }
 
-                       var ma = new MemberAccess.simple (local.name, source_reference);
-                       Expression replace = ma;
-
-                       if (target_type == null) {
-                               replace = new ReferenceTransferExpression (replace, source_reference);
-                               replace.target_type = local.variable_type.copy ();
-                               replace.target_type.value_owned = true;
-                       } else {
-                               replace.target_type = target_type.copy ();
-                       }
-                       replace.check (context);
+                       var temp_access = SemanticAnalyzer.create_temp_access (local, target_type);
+                       temp_access.check (context);
 
-                       parent_node.replace_expression (this, replace);
+                       parent_node.replace_expression (this, temp_access);
 
                        return true;
                }