diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2020-10-18 21:08:46 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2020-10-18 21:17:40 +0200 |
| commit | b8bc5e2e44698cef18fa4378deafd737297fb65e (patch) | |
| tree | 64fd63cb1f6d0f31d9637253b72104b5de9d88c2 | |
| parent | dbf4e81d3e76857aa3bc18209cc958098672c669 (diff) | |
| download | vala-b8bc5e2e44698cef18fa4378deafd737297fb65e.tar.gz | |
codegen: Don't use inferred type for temp-value to access generic property
Fixes https://gitlab.gnome.org/GNOME/vala/issues/1088
| -rw-r--r-- | codegen/valaccodememberaccessmodule.vala | 6 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/generics/property-int-cast.vala | 12 |
3 files changed, 18 insertions, 1 deletions
diff --git a/codegen/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala index f46ea9dfd..3199ea24e 100644 --- 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 c6865db09..3be19f407 100644 --- 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 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); +} |