Set parent_node and always copy datatype when assigned to code nodes.

This is a delicate patch that fixes subtle memory corruption bugs in
libvala users and the compiler itself.
It might break some application, so this commit is open for testing.

diff --git a/vala/valaarraycreationexpression.vala b/vala/valaarraycreationexpression.vala
index 3b52748ff9e9cea6fb42674860ca8a87e0c548a6..c0f38300f9189f308d14af8d3965541bd469bb59 100644 (file)
--- a/vala/valaarraycreationexpression.vala
+++ b/vala/valaarraycreationexpression.vala
@@ -34,7 +34,7 @@ public class Vala.ArrayCreationExpression : Expression {
        public DataType element_type {
                get { return _element_type; }
                set {
-                       _element_type = value;
+                       _element_type = value.copy ();
                        _element_type.parent_node = this;
                }
        }

diff --git a/vala/valaarraytype.vala b/vala/valaarraytype.vala
index b3767233529d19bbf4f17f66af8fb47628a69e7e..11bf1a720e3d8f6a68d7275e06b6b45b26703f17 100644 (file)
--- a/vala/valaarraytype.vala
+++ b/vala/valaarraytype.vala
@@ -32,7 +32,7 @@ public class Vala.ArrayType : ReferenceType {
        public DataType element_type {
                get { return _element_type; }
                set {
-                       _element_type = value;
+                       _element_type = value.copy ();
                        _element_type.parent_node = this;
                }
        }

diff --git a/vala/valacastexpression.vala b/vala/valacastexpression.vala
index c7a72b6f254e20a7260317c2d1d7522f12093fe5..c09e8abdcb9ad963ad2f6591b87b7b5f33c816f2 100644 (file)
--- a/vala/valacastexpression.vala
+++ b/vala/valacastexpression.vala
@@ -44,7 +44,7 @@ public class Vala.CastExpression : Expression {
        public DataType type_reference {
                get { return _data_type; }
                set {
-                       _data_type = value;
+                       _data_type = value.copy ();
                        _data_type.parent_node = this;
                }
        }

diff --git a/vala/valacatchclause.vala b/vala/valacatchclause.vala
index b2f20a49194dbf767c015a9eea72427376327550..ef1f99840861491f60e7d972aa5038499c66b4ce 100644 (file)
--- a/vala/valacatchclause.vala
+++ b/vala/valacatchclause.vala
@@ -31,8 +31,9 @@ public class Vala.CatchClause : CodeNode {
        public DataType? error_type {
                get { return _data_type; }
                set {
-                       _data_type = value;
-                       if (_data_type != null) {
+                       _data_type = null;
+                       if (value != null) {
+                               _data_type = value.copy ();
                                _data_type.parent_node = this;
                        }
                }

diff --git a/vala/valaclass.vala b/vala/valaclass.vala
index ba23a508fb6611decf042bbfcb031b1353db829b..a88fb01ee979b29f2b550f24ab307b8023606029 100644 (file)
--- a/vala/valaclass.vala
+++ b/vala/valaclass.vala
@@ -225,10 +225,11 @@ public class Vala.Class : ObjectTypeSymbol {
         * @param type a class or interface reference
         */
        public void add_base_type (DataType type) {
-               base_types.add (type);
-               type.parent_node = this;
+               var copy = type.copy ();
+               base_types.add (copy);
+               copy.parent_node = this;
        }
-
+       
        /**
         * Returns a copy of the base type list.
         *
@@ -556,6 +557,7 @@ public class Vala.Class : ObjectTypeSymbol {
                for (int i = 0; i < base_types.size; i++) {
                        if (base_types[i] == old_type) {
                                base_types[i] = new_type;
+                               new_type.parent_node = this;
                                return;
                        }
                }

diff --git a/vala/valaconstant.vala b/vala/valaconstant.vala
index 53b84c60e0eb91807dac1943915b4216660e7dda..0c789bd206142facb2b1321285322f479cff422a 100644 (file)
--- a/vala/valaconstant.vala
+++ b/vala/valaconstant.vala
@@ -32,7 +32,7 @@ public class Vala.Constant : Symbol, Lockable {
        public DataType type_reference {
                get { return _data_type; }
                set {
-                       _data_type = value;
+                       _data_type = value.copy ();
                        _data_type.parent_node = this;
                }
        }

diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala
index 085d321e0519302ff1a0da8c50a2a7c130b422e2..376e1f172a595ec4d387f604608097b1860bb86e 100644 (file)
--- a/vala/valadatatype.vala
+++ b/vala/valadatatype.vala
@@ -71,8 +71,9 @@ public abstract class Vala.DataType : CodeNode {
                if (type_argument_list == null) {
                        type_argument_list = new ArrayList<DataType> ();
                }
-               type_argument_list.add (arg);
-               arg.parent_node = this;
+               var copy = arg.copy ();
+               type_argument_list.add (copy);
+               copy.parent_node = this;
        }
        
        /**
@@ -251,6 +252,7 @@ public abstract class Vala.DataType : CodeNode {
                        for (int i = 0; i < type_argument_list.size; i++) {
                                if (type_argument_list[i] == old_type) {
                                        type_argument_list[i] = new_type;
+                                       new_type.parent_node = this;
                                        return;
                                }
                        }

diff --git a/vala/valadelegate.vala b/vala/valadelegate.vala
index d949c611f18e47992e1c8da31e59ebffa55b2f56..14f7ffade41b876728e2d8410c0d028c94f5c6bb 100644 (file)
--- a/vala/valadelegate.vala
+++ b/vala/valadelegate.vala
@@ -32,7 +32,7 @@ public class Vala.Delegate : TypeSymbol {
        public DataType return_type {
                get { return _return_type; }
                set {
-                       _return_type = value;
+                       _return_type = value.copy ();
                        _return_type.parent_node = this;
                }
        }

diff --git a/vala/valaexpression.vala b/vala/valaexpression.vala
index 620086e9806d220a32506065cf8402d0c5c2780c..96e037d029a5ea4514dc22283f5445a04c7a9afb 100644 (file)
--- a/vala/valaexpression.vala
+++ b/vala/valaexpression.vala
@@ -31,18 +31,71 @@ public abstract class Vala.Expression : CodeNode {
         * 
         * The semantic analyzer computes this value.
         */
-       public DataType value_type { get; set; }
+       public DataType value_type {
+               get {
+                       return _value_type;
+               }
+
+               set {
+                       _value_type = null;
+                       if (value != null) {
+                               _value_type = value.copy ();
+                               _value_type.parent_node = this;
+                       }
+               }
+       }
+
+       private DataType _value_type;
+
+       public DataType? formal_value_type {
+               get {
+                       return _formal_value_type;
+               }
+               set {
+                       _formal_value_type = null;
+                       if (value != null) {
+                               _formal_value_type = value.copy ();
+                               _formal_value_type.parent_node = this;
+                       }
+               }
+       }
 
-       public DataType? formal_value_type { get; set; }
+       private DataType _formal_value_type;
 
        /*
         * The static type this expression is expected to have.
         *
         * The semantic analyzer computes this value, lambda expressions use it.
         */
-       public DataType target_type { get; set; }
+       public DataType target_type {
+               get {
+                       return _target_type;
+               }
+               set {
+                       _target_type = null;
+                       if (value != null) {
+                               _target_type = value.copy ();
+                               _target_type.parent_node = this;
+                       }
+               }
+       }
+
+       private DataType _target_type;
+
+       public DataType? formal_target_type {
+               get {
+                       return _formal_target_type;
+               }
+               set {
+                       _formal_target_type = null;
+                       if (value != null) {
+                               _formal_target_type = value.copy ();
+                               _formal_target_type.parent_node = this;
+                       }
+               }
+       }
 
-       public DataType? formal_target_type { get; set; }
+       private DataType _formal_target_type;
 
        /**
         * The symbol this expression refers to.

diff --git a/vala/valaforeachstatement.vala b/vala/valaforeachstatement.vala
index 8c6522229763a83c4354261ff9b37c14c0096b4c..e10192d8983f7dcecdf135cddd2e7c1b166c3564 100644 (file)
--- a/vala/valaforeachstatement.vala
+++ b/vala/valaforeachstatement.vala
@@ -32,8 +32,9 @@ public class Vala.ForeachStatement : Block {
        public DataType? type_reference {
                get { return _data_type; }
                set {
-                       _data_type = value;
-                       if (_data_type != null) {
+                       _data_type = null;
+                       if (value != null) {
+                               _data_type = value.copy ();
                                _data_type.parent_node = this;
                        }
                }

diff --git a/vala/valainterface.vala b/vala/valainterface.vala
index 49bc0ae2cf2d1e79135e916cd8d20c8d7a187aca..cc7ce13aa12919a5c1cae99f66d9d8055b7aee89 100644 (file)
--- a/vala/valainterface.vala
+++ b/vala/valainterface.vala
@@ -95,8 +95,9 @@ public class Vala.Interface : ObjectTypeSymbol {
         * @param type an interface or class reference
         */
        public void add_prerequisite (DataType type) {
-               prerequisites.add (type);
-               type.parent_node = this;
+               var copy = type.copy ();
+               prerequisites.add (copy);
+               copy.parent_node = this;
        }
 
        /**
@@ -106,7 +107,9 @@ public class Vala.Interface : ObjectTypeSymbol {
         * @param type an interface or class reference
         */
        public void prepend_prerequisite (DataType type) {
-               prerequisites.insert (0, type);
+               var copy = type.copy ();
+               prerequisites.insert (0, copy);
+               copy.parent_node = this;
        }
 
        /**
@@ -349,6 +352,7 @@ public class Vala.Interface : ObjectTypeSymbol {
                for (int i = 0; i < prerequisites.size; i++) {
                        if (prerequisites[i] == old_type) {
                                prerequisites[i] = new_type;
+                               new_type.parent_node = this;
                                return;
                        }
                }

diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala
index af9f51f383c171500f3b9985ecb49320e6853409..156f9aa91b9c1ed953f2af1b37b5e784003c28f6 100644 (file)
--- a/vala/valamemberaccess.vala
+++ b/vala/valamemberaccess.vala
@@ -102,8 +102,9 @@ public class Vala.MemberAccess : Expression {
         * @param arg a type reference
         */
        public void add_type_argument (DataType arg) {
-               type_argument_list.add (arg);
-               arg.parent_node = this;
+               var copy = arg.copy ();
+               type_argument_list.add (copy);
+               copy.parent_node = this;
        }
        
        /**
@@ -160,6 +161,7 @@ public class Vala.MemberAccess : Expression {
                for (int i = 0; i < type_argument_list.size; i++) {
                        if (type_argument_list[i] == old_type) {
                                type_argument_list[i] = new_type;
+                               new_type.parent_node = this;
                                return;
                        }
                }

diff --git a/vala/valamethod.vala b/vala/valamethod.vala
index 663ae6fdfcdf4e1eba57130ac2d9aa493a86029c..eef04ab72d247c567dcf483c9c0f6d988ca7c73d 100644 (file)
--- a/vala/valamethod.vala
+++ b/vala/valamethod.vala
@@ -36,7 +36,7 @@ public class Vala.Method : Subroutine {
        public DataType return_type {
                get { return _return_type; }
                set {
-                       _return_type = value;
+                       _return_type = value.copy ();
                        _return_type.parent_node = this;
                }
        }

diff --git a/vala/valaobjectcreationexpression.vala b/vala/valaobjectcreationexpression.vala
index a4121f3aae3abc9b7e9cfd44405825038bdb45fa..56fb3ae3458e57daf24e77f257129721b75025bf 100644 (file)
--- a/vala/valaobjectcreationexpression.vala
+++ b/vala/valaobjectcreationexpression.vala
@@ -32,7 +32,7 @@ public class Vala.ObjectCreationExpression : Expression {
        public DataType type_reference {
                get { return _data_type; }
                set {
-                       _data_type = value;
+                       _data_type = value.copy ();
                        _data_type.parent_node = this;
                }
        }

diff --git a/vala/valapointertype.vala b/vala/valapointertype.vala
index 4bfaf34ee862dad864250c10ec4843a74461c659..5ec9228c53886c4b61c6879d4927709907ce77f9 100644 (file)
--- a/vala/valapointertype.vala
+++ b/vala/valapointertype.vala
@@ -32,7 +32,7 @@ public class Vala.PointerType : DataType {
        public DataType base_type {
                get { return _base_type; }
                set {
-                       _base_type = value;
+                       _base_type = value.copy ();
                        _base_type.parent_node = this;
                }
        }

diff --git a/vala/valaproperty.vala b/vala/valaproperty.vala
index 8a8ced49b432f2dcec63741441281b0badc4ebd7..300fb4dd16ea0f2cf53e92647c835e004d52dc87 100644 (file)
--- a/vala/valaproperty.vala
+++ b/vala/valaproperty.vala
@@ -33,8 +33,9 @@ public class Vala.Property : Symbol, Lockable {
        public DataType? property_type {
                get { return _data_type; }
                set {
-                       _data_type = value;
+                       _data_type = null;
                        if (value != null) {
+                               _data_type = value.copy ();
                                _data_type.parent_node = this;
                        }
                }

diff --git a/vala/valapropertyaccessor.vala b/vala/valapropertyaccessor.vala
index 466fe6c181bd6c87b4a0f6cc920160ba0a98c0d0..3903ae83519f0fd07124325ce3c69c66d44226ba 100644 (file)
--- a/vala/valapropertyaccessor.vala
+++ b/vala/valapropertyaccessor.vala
@@ -39,8 +39,9 @@ public class Vala.PropertyAccessor : Subroutine {
        public DataType? value_type {
                get { return _value_type; }
                set {
-                       _value_type = value;
+                       _value_type = null;
                        if (value != null) {
+                               _value_type = value.copy ();
                                _value_type.parent_node = this;
                        }
                }

diff --git a/vala/valasignal.vala b/vala/valasignal.vala
index 3ddc453b38e6956b1454b70fe3b265cf2611c3fd..866760fe2d0cd4dea89d9f6608adf46737a7c176 100644 (file)
--- a/vala/valasignal.vala
+++ b/vala/valasignal.vala
@@ -32,7 +32,7 @@ public class Vala.Signal : Symbol, Lockable {
        public DataType return_type {
                get { return _return_type; }
                set {
-                       _return_type = value;
+                       _return_type = value.copy ();
                        _return_type.parent_node = this;
                }
        }

diff --git a/vala/valasizeofexpression.vala b/vala/valasizeofexpression.vala
index 42c1ee5991bbc130e26addc3da157fdb56d2eb82..1fd80c456cd0f6afe707cf4dfc79d53065e562b6 100644 (file)
--- a/vala/valasizeofexpression.vala
+++ b/vala/valasizeofexpression.vala
@@ -32,7 +32,7 @@ public class Vala.SizeofExpression : Expression {
        public DataType type_reference {
                get { return _data_type; }
                set {
-                       _data_type = value;
+                       _data_type = value.copy ();
                        _data_type.parent_node = this;
                }
        }

diff --git a/vala/valatypeofexpression.vala b/vala/valatypeofexpression.vala
index 9b0e02e13f1ce240fcb57190e57651d7e4c82ced..1e932f16f113d583e2aee98f8fd956efcb08508e 100644 (file)
--- a/vala/valatypeofexpression.vala
+++ b/vala/valatypeofexpression.vala
@@ -32,7 +32,7 @@ public class Vala.TypeofExpression : Expression {
        public DataType type_reference {
                get { return _data_type; }
                set {
-                       _data_type = value;
+                       _data_type = value.copy ();
                        _data_type.parent_node = this;
                }
        }

diff --git a/vala/valavariable.vala b/vala/valavariable.vala
index e625e660bba7890c52d314addadb74f68f9d0bfa..a65fcbeb290986394a67a170decb68abcd2d85f9 100644 (file)
--- a/vala/valavariable.vala
+++ b/vala/valavariable.vala
@@ -42,8 +42,9 @@ public class Vala.Variable : Symbol {
        public DataType? variable_type {
                get { return _variable_type; }
                set {
-                       _variable_type = value;
-                       if (_variable_type != null) {
+                       _variable_type = null;
+                       if (value != null) {
+                               _variable_type = value.copy ();
                                _variable_type.parent_node = this;
                        }
                }