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 56c27bf89a6893a66073877442cbe2a9622d1e8c..9d1d88b3b9fa6af2509264ecd2e1d970a5440631 100644 (file)
--- a/codegen/valaccodememberaccessmodule.vala
+++ b/codegen/valaccodememberaccessmodule.vala
@@ -313,7 +313,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 26a8eaa6ce01206e70c01059bfea908b70ace88b..a2f37571646aaff1f288e39398081eda466f6441 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -525,6 +525,7 @@ TESTS = \
        generics/integer-type-cast.vala \
        generics/parameter-invalid-initializer.test \
        generics/parameter-sizeof-initializer.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);
+}