codegen: Don't use inferred type for temp-value to access generic property

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

diff --git a/codegen/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala
index f46ea9dfde83493d9b51217fa2f143912a90b75d..3199ea24efe8d641eced74ec4d59feea1305905f 100644 (file)
--- a/codegen/valaccodememberaccessmodule.vala
+++ b/codegen/valaccodememberaccessmodule.vala
@@ -357,7 +357,11 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
                                set_cvalue (expr, ctemp);
                        }
 
-                       expr.target_value.value_type = expr.value_type;
+                       if (prop.get_accessor.value_type is GenericType) {
+                               expr.target_value.value_type = prop.get_accessor.value_type.copy ();
+                       } else {
+                               expr.target_value.value_type = expr.value_type.copy ();
+                       }
                        expr.target_value = store_temp_value (expr.target_value, expr);
                } else if (expr.symbol_reference is LocalVariable) {
                        var local = (LocalVariable) expr.symbol_reference;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c6865db09e61af8297ab9913f18679838f759593..3be19f407ac597b46f354865b61fe4afa89872e8 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -615,6 +615,7 @@ TESTS = \
        generics/parameter-invalid-initializer.test \
        generics/parameter-sizeof-initializer.vala \
        generics/member-dup-destroy.vala \
+       generics/property-int-cast.vala \
        generics/string-literal-comparison.vala \
        generics/type-parameter-properties.vala \
        generics/bug640330.test \

diff --git a/tests/generics/property-int-cast.vala b/tests/generics/property-int-cast.vala
new file mode 100644 (file)
index 0000000..69478ef
--- /dev/null
+++ b/tests/generics/property-int-cast.vala
@@ -0,0 +1,12 @@
+class Foo<G> {
+       public G prop { get; private set; }
+
+       public Foo (G g) {
+               prop = g;
+       }
+}
+
+void main() {
+       var foo = new Foo<int> (23);
+       assert (foo.prop == 23);
+}