vala: Don't allow GLib.Value casting to nullable struct/simple types

diff --git a/tests/Makefile.am b/tests/Makefile.am
index bc5888bbec45b9893441da7edf192f3ad57d190b..b8b15b2cf652165ae73208c4a4af67610a860723 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -870,6 +870,7 @@ TESTS = \
        semantic/assignment-same-variable.vala \
        semantic/assignment-signal-incompatible-method.test \
        semantic/assignment-signal-incompatible-type.test \
+       semantic/cast-gvalue-unsupported.test \
        semantic/cast-gvariant-unsupported.test \
        semantic/chainup-gobject-incompatible-type-property.test \
        semantic/chainup-gobject-unknown-property.test \

diff --git a/tests/semantic/cast-gvalue-unsupported.test b/tests/semantic/cast-gvalue-unsupported.test
new file mode 100644 (file)
index 0000000..ef60d90
--- /dev/null
+++ b/tests/semantic/cast-gvalue-unsupported.test
@@ -0,0 +1,6 @@
+Invalid Code
+
+void main () {
+       Value v = Value (typeof (int));
+       var i = (int?) v;
+}

diff --git a/vala/valacastexpression.vala b/vala/valacastexpression.vala
index cc3dbca9ebf03db3189c3e37a63cc0f34549d58a..9aff511facdf317630004756c1aefd4aaee25983 100644 (file)
--- a/vala/valacastexpression.vala
+++ b/vala/valacastexpression.vala
@@ -215,6 +215,10 @@ public class Vala.CastExpression : Expression {
                    && is_gvalue (context, inner.value_type) && !is_gvalue (context, value_type)) {
                        // GValue unboxing returns unowned value
                        value_type.value_owned = false;
+                       if (value_type.nullable && value_type.type_symbol != null && !value_type.type_symbol.is_reference_type ()) {
+                               error = true;
+                               Report.error (source_reference, "Casting of `GLib.Value' to `%s' is not supported", value_type.to_qualified_string ());
+                       }
                }
 
                inner.target_type = inner.value_type.copy ();