From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 18 Oct 2020 19:08:46 +0000 (+0200)
Subject: codegen: Don't use inferred type for temp-value to access generic property
X-Git-Tag: 0.40.25~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6509a1a33b876ef885bbb9bff74a82c82340cdca;p=thirdparty%2Fvala.git

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 56c27bf89..9d1d88b3b 100644
--- 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 26a8eaa6c..a2f375716 100644
--- 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
index 000000000..69478efd3
--- /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);
+}