From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 1 Feb 2014 10:15:24 +0000 (+0100)
Subject: Use return_temp_access in conditional expression
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=456e3c20ff8b412bdcf6b18cec9731197983bc52;p=thirdparty%2Fvala.git

Use return_temp_access in conditional expression
---

diff --git a/codegen/valaccodetransformer.vala b/codegen/valaccodetransformer.vala
index cfa7fa2b1..ee346cec8 100644
--- a/codegen/valaccodetransformer.vala
+++ b/codegen/valaccodetransformer.vala
@@ -404,9 +404,7 @@ public class Vala.CCodeTransformer : CodeTransformer {
 		b.add_assignment (expression (result), expr.false_expression);
 		b.close ();
 
-		replacement = expression (result);
-		replacement.target_type = target_type;
-		replacement.formal_target_type = formal_target_type;
+		replacement = return_temp_access (result, expr.value_type, target_type, formal_target_type);
 		context.analyzer.replaced_nodes.add (expr);
 		old_parent_node.replace_expression (expr, replacement);
 		b.check (this);