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 b759d632c641ba90b7a2fffffec27708053edeee..d130235a670bdf227b67cbc0abdc9280d1964cfc 100644 (file)
--- 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 ef71b559bda082bbd8af40920b59cce010298b1f..0d6e165022c06a0d050d6e2f33f0252edf7aaa31 100644 (file)
--- 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 (file)
index 0000000..5487208
--- /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));
+}