vala: Don't allow casting real structs to classes or simple-types

This led to C compiler errors or obvious runtimes failures.

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1249

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9a6c4b3f2d7225c827aac2993fb16a1d256fc38e..ad65913ce263375cc237874cd34907320c142fbc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -345,6 +345,8 @@ TESTS = \
        enums/bug763831.vala \
        enums/bug780050.vala \
        structs/cast-struct-boxed.vala \
+       structs/cast-struct-to-class.test \
+       structs/cast-struct-to-simple-struct.test \
        structs/struct_only.vala \
        structs/struct-base-types.vala \
        structs/struct-boxed-cast.vala \

diff --git a/tests/structs/cast-struct-to-class.test b/tests/structs/cast-struct-to-class.test
new file mode 100644 (file)
index 0000000..c87931e
--- /dev/null
+++ b/tests/structs/cast-struct-to-class.test
@@ -0,0 +1,10 @@
+Invalid Code
+
+struct Foo {
+       public int i;
+}
+
+void main () {
+       Foo foo = { 42 };
+       Object bar = (Object) foo;
+}

diff --git a/tests/structs/cast-struct-to-simple-struct.test b/tests/structs/cast-struct-to-simple-struct.test
new file mode 100644 (file)
index 0000000..3cb6681
--- /dev/null
+++ b/tests/structs/cast-struct-to-simple-struct.test
@@ -0,0 +1,10 @@
+Invalid Code
+
+struct Foo {
+       public int i;
+}
+
+void main () {
+       Foo foo = { 42 };
+       int bar = (int) foo;
+}

diff --git a/vala/valacastexpression.vala b/vala/valacastexpression.vala
index 732b99a716d8c2e9e6df593c8e0b357d98719d0e..5d0783e41d95a4bf8568a510226d0fa769d0b503 100644 (file)
--- a/vala/valacastexpression.vala
+++ b/vala/valacastexpression.vala
@@ -170,6 +170,15 @@ public class Vala.CastExpression : Expression {
                        return false;
                }
 
+               // Allow casting to array or pointer type
+               if (!(type_reference is ArrayType || type_reference is PointerType)) {
+                       if (!type_reference.is_real_struct_type () && inner.value_type.is_real_struct_type ()
+                           && (context.profile != Profile.GOBJECT || !(is_gvariant (context, inner.value_type) || is_gvalue (context, inner.value_type)))) {
+                               error = true;
+                               Report.error (source_reference, "Casting of struct `%s' to `%s' is not allowed", inner.value_type.to_qualified_string (), type_reference.to_qualified_string ());
+                       }
+               }
+
                if (type_reference is DelegateType && inner.value_type is MethodType) {
                        if (target_type != null) {
                                inner.value_type.value_owned = target_type.value_owned;