From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 15 Apr 2021 14:49:14 +0000 (+0200)
Subject: vala: Improve semantic check of simple type structs
X-Git-Tag: 0.53.1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3877c507f883e4f23d74d921fda817ffc9c5099b;p=thirdparty%2Fvala.git

vala: Improve semantic check of simple type structs
---

diff --git a/vala/valastruct.vala b/vala/valastruct.vala
index 120a7b086..4c4e28fdc 100644
--- a/vala/valastruct.vala
+++ b/vala/valastruct.vala
@@ -560,6 +560,9 @@ public class Vala.Struct : TypeSymbol {
 			}
 		}
 
+		// FIXME Perform this [SimpleType] check in a better way
+		is_disposable ();
+
 		if (!external && !external_package) {
 			bool has_instance_field = false;
 			foreach (Field f in fields) {
diff --git a/vala/valavaluetype.vala b/vala/valavaluetype.vala
index aa97f7c39..699046fb4 100644
--- a/vala/valavaluetype.vala
+++ b/vala/valavaluetype.vala
@@ -41,7 +41,7 @@ public abstract class Vala.ValueType : DataType {
 		}
 
 		unowned Struct? st = type_symbol as Struct;
-		if (st != null) {
+		if (st != null && !st.error) {
 			return st.is_disposable ();
 		}