From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 10 Nov 2016 10:52:16 +0000 (+0100)
Subject: codegen: Don't implicitly initialize local variables with an initializer
X-Git-Tag: 0.35.1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5c654f76eeb1ee887f3d89eb701cf82f75a430a;p=thirdparty%2Fvala.git

codegen: Don't implicitly initialize local variables with an initializer
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index a95023c10..939b256ca 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -2358,7 +2358,9 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
 				// try to initialize uninitialized variables
 				// initialization not necessary for variables stored in closure
-				cvar.initializer = default_value_for_type (local.variable_type, true);
+				if (local.initializer == null) {
+					cvar.initializer = default_value_for_type (local.variable_type, true);
+				}
 				cvar.init0 = true;
 
 				ccode.add_declaration (get_ccode_name (local.variable_type), cvar);
@@ -3488,7 +3490,9 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 		} else {
 			var cvar = new CCodeVariableDeclarator (local.name, null, get_ccode_declarator_suffix (local.variable_type));
 			if (init) {
-				cvar.initializer = default_value_for_type (local.variable_type, true);
+				if (local.initializer == null) {
+					cvar.initializer = default_value_for_type (local.variable_type, true);
+				}
 				cvar.init0 = true;
 			}
 			ccode.add_declaration (get_ccode_name (local.variable_type), cvar);