From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 11 May 2011 07:47:51 +0000 (+0200)
Subject: codegen: Don't use simple struct initializer if local is a GValue
X-Git-Tag: 0.12.1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62ac470108294da888912323ec8af386480b6c1e;p=thirdparty%2Fvala.git

codegen: Don't use simple struct initializer if local is a GValue

Fixes bug 621176.
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index b759d632c..d130235a6 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -2024,7 +2024,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 		var st = local.variable_type.data_type as Struct;
 		var initializer = local.initializer as ObjectCreationExpression;
 		if (st != null && (!st.is_simple_type () || st.get_cname () == "va_list") && !local.variable_type.nullable &&
-		    initializer != null && initializer.get_object_initializer ().size == 0) {
+		    local.variable_type.data_type != gvalue_type && initializer != null && initializer.get_object_initializer ().size == 0) {
 			return true;
 		} else {
 			return false;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ef71b559b..0d6e16502 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -51,6 +51,7 @@ TESTS = \
 	structs/bug606202.vala \
 	structs/bug613513.vala \
 	structs/bug613825.vala \
+	structs/bug621176.vala \
 	structs/bug622422.vala \
 	delegates/delegates.vala \
 	delegates/bug595610.vala \
diff --git a/tests/structs/bug621176.vala b/tests/structs/bug621176.vala
new file mode 100644
index 000000000..5487208cc
--- /dev/null
+++ b/tests/structs/bug621176.vala
@@ -0,0 +1,8 @@
+struct Foo {
+	int i;
+}
+
+void main () {
+	Value v = Foo ();
+	assert (v.type() == typeof (Foo));
+}