vala: Add some missing type copying

diff --git a/vala/valaassignment.vala b/vala/valaassignment.vala
index d00e2f011e1a8b7c21753cb61a3597649944ec6c..abb225662b223a5343314cefb2e1c03e61c93196 100644 (file)
--- a/vala/valaassignment.vala
+++ b/vala/valaassignment.vala
@@ -221,10 +221,10 @@ public class Vala.Assignment : Expression {
                                parent_node.replace_expression (this, set_call);
                                return set_call.check (context);
                        } else {
-                               right.target_type = left.value_type;
+                               right.target_type = left.value_type.copy ();
                        }
                } else if (left is PointerIndirection) {
-                       right.target_type = left.value_type;
+                       right.target_type = left.value_type.copy ();
                } else {
                        error = true;
                        Report.error (source_reference, "unsupported lvalue in assignment");
@@ -247,7 +247,7 @@ public class Vala.Assignment : Expression {
                        var old_value = new MemberAccess (ma.inner, ma.member_name);
 
                        var bin = new BinaryExpression (BinaryOperator.PLUS, old_value, right, source_reference);
-                       bin.target_type = right.target_type;
+                       bin.target_type = right.target_type.copy ();
                        right.target_type = right.target_type.copy ();
                        right.target_type.value_owned = false;
 
@@ -315,7 +315,7 @@ public class Vala.Assignment : Expression {
                                                return false;
                                        }
 
-                                       right.value_type = variable.variable_type;
+                                       right.value_type = variable.variable_type.copy ();
                                } else {
                                        error = true;
                                        Report.error (source_reference, "Assignment: Invalid assignment attempt");

diff --git a/vala/valareturnstatement.vala b/vala/valareturnstatement.vala
index cdb782cf29367634fa17975373935c8c94b46768..f51164968d69d81c99a22598674ab83afc49dfc6 100644 (file)
--- a/vala/valareturnstatement.vala
+++ b/vala/valareturnstatement.vala
@@ -84,7 +84,7 @@ public class Vala.ReturnStatement : CodeNode, Statement {
                checked = true;
 
                if (return_expression != null) {
-                       return_expression.target_type = context.analyzer.current_return_type;
+                       return_expression.target_type = context.analyzer.current_return_type.copy ();
                }
 
                if (return_expression != null && !return_expression.check (context)) {