codegen: Use temporary variable for string concatenation

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index e36b50716e73b85f3be75257c95babc9d6892447..bc8604e8b746ce6d8725f83570c2402570f2f562 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -4994,11 +4994,17 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                                                set_cvalue (expr, strcat);
                                        } else {
                                                // convert to g_strconcat (a, b, NULL)
+                                               var temp_var = get_temp_variable (expr.value_type, true, null, false);
+                                               var temp_ref = get_variable_cexpression (temp_var.name);
+                                               emit_temp_var (temp_var);
+
                                                var ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_strconcat"));
                                                ccall.add_argument (cleft);
                                                ccall.add_argument (cright);
                                                ccall.add_argument (new CCodeConstant("NULL"));
-                                               set_cvalue (expr, ccall);
+
+                                               ccode.add_assignment (temp_ref, ccall);
+                                               set_cvalue (expr, temp_ref);
                                        }
                                        return;
                                }