codegen: Do not try to unbox a GValue from a GValue

Fixes bug 658048.

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 76fc9d6f826fe2842daf13f07ebda1682dd2a88a..5b66896133e0534348ec7f07ed63310d46f31526 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -4462,7 +4462,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
        }
 
        public CCodeExpression? try_cast_value_to_type (CCodeExpression ccodeexpr, DataType from, DataType to, Expression? expr = null) {
-               if (from == null || gvalue_type == null || from.data_type != gvalue_type || get_ccode_type_id (to) == "") {
+               if (from == null || gvalue_type == null || from.data_type != gvalue_type || to.data_type == gvalue_type || get_ccode_type_id (to) == "") {
                        return null;
                }
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d1b1491f9bf6f45976717042c8d2fe842e59f1c7..751766d3146d196e24ebd204c3a7fd25b130de94 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -73,6 +73,7 @@ TESTS = \
        structs/bug654646.vala \
        structs/bug654753.vala \
        structs/bug656693.vala \
+       structs/bug658048.vala \
        delegates/delegates.vala \
        delegates/bug539166.vala \
        delegates/bug595610.vala \

diff --git a/tests/structs/bug658048.vala b/tests/structs/bug658048.vala
new file mode 100644 (file)
index 0000000..dda3b0e
--- /dev/null
+++ b/tests/structs/bug658048.vala
@@ -0,0 +1,4 @@
+void main () {
+       Value a = 10;
+       bool res = a == a;
+}