From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 6 Jan 2021 11:19:10 +0000 (+0100)
Subject: codegen: Fix assignment of casted struct value to property
X-Git-Tag: 0.51.1~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c18f55393b84ab678973566c30947c1a17734dbc;p=thirdparty%2Fvala.git

codegen: Fix assignment of casted struct value to property

Usage of address-of operator requires lvalue access. Therefore use a
temporary variable to be passed to property setter.

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1126
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index d6463a8aa..0be29ed99 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -6225,6 +6225,11 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 				ccall.add_argument ((CCodeExpression) get_ccodenode (instance));
 				var cexpr = get_cvalue_ (value);
 				if (prop.property_type.is_real_non_null_struct_type ()) {
+					//TODO Make use of get_lvalue (value)
+					if (!(cexpr is CCodeConstant || cexpr is CCodeIdentifier)) {
+						var temp_value = store_temp_value (value, instance);
+						cexpr = get_cvalue_ (temp_value);
+					}
 					cexpr = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, cexpr);
 				}
 				ccall.add_argument (cexpr);
@@ -6281,6 +6286,11 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 		var cexpr = get_cvalue_ (value);
 
 		if (prop.property_type.is_real_non_null_struct_type ()) {
+			//TODO Make use of get_lvalue (value)
+			if (!(cexpr is CCodeConstant || cexpr is CCodeIdentifier)) {
+				var temp_value = store_temp_value (value, instance);
+				cexpr = get_cvalue_ (temp_value);
+			}
 			cexpr = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, cexpr);
 		}
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e0a9e19da..bd4b19daa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -464,6 +464,7 @@ TESTS = \
 	objects/property-delegate.vala \
 	objects/property-delegate-owned.vala \
 	objects/property-gboxed-nullable.vala \
+	objects/property-real-struct-assignment.vala \
 	objects/property-real-struct-no-accessor.test \
 	objects/property-simple-type-struct-nullable.vala \
 	objects/property-static.vala \
diff --git a/tests/objects/property-real-struct-assignment.vala b/tests/objects/property-real-struct-assignment.vala
new file mode 100644
index 000000000..26790763c
--- /dev/null
+++ b/tests/objects/property-real-struct-assignment.vala
@@ -0,0 +1,56 @@
+struct Foo {
+	string s;
+}
+
+Foo? get_foo () {
+	return { "foo" };
+}
+
+class Manam : Object {
+	public virtual Foo faz { get; set; }
+}
+
+class Bar : Manam {
+	public Foo foo { get; set; }
+
+	public Bar () {
+		{
+			this.foo = get_foo ();
+		}
+		{
+			base.faz = get_foo ();
+		}
+		{
+			this.foo = (!) get_foo ();
+		}
+		{
+			base.faz = (!) get_foo ();
+		}
+		{
+			this.foo = (Foo) get_foo ();
+		}
+		{
+			base.faz = (Foo) get_foo ();
+		}
+		{
+			var f = get_foo ();
+			this.foo = (!) f;
+		}
+		{
+			var f = get_foo ();
+			base.faz = (!) f;
+		}
+		{
+			var f = get_foo ();
+			this.foo = (Foo) f;
+		}
+		{
+			var f = get_foo ();
+			base.faz = (Foo) f;
+		}
+	}
+}
+
+void main() {
+	var bar = new Bar ();
+}