vala: Improve semantic check of simple type structs

diff --git a/vala/valastruct.vala b/vala/valastruct.vala
index 120a7b086f7103387a190ee4eb099902794111da..4c4e28fdc7370131f564d555e784e03762034ce2 100644 (file)
--- 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 aa97f7c3973a859d9d80bba30ecd3a0ad4d3b170..699046fb4b5e9f737242971ed158fa7d3bddae1b 100644 (file)
--- 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 ();
                }