Changeset 92f5279

Timestamp:

Jun 25, 2019, 2:51:50 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b604426

Parents:

bcb311b

Message:

Deeper clone on forall-lists on types to fix weak-ref error

Location:

src/AST

Files:

• Decl.hpp (modified) (1 diff)
• Type.hpp (modified) (2 diffs)

src/AST/Decl.hpp

@@ -201 +201 @@
         TypeDecl * clone() const override { return new TypeDecl{ *this }; }
         MUTATE_FRIEND
+        friend class ParameterizedType;  // to allow deep clones
 };
 

src/AST/Type.hpp

@@ -268 +268 @@
 public:
         using ForallList = std::vector<ptr<TypeDecl>>;
-
+        
         ForallList forall;
 
@@ -277 +277 @@
         ParameterizedType( CV::Qualifiers q, std::vector<ptr<Attribute>> && as = {} )
         : Type(q, std::move(as)), forall() {}
+
+        ParameterizedType( const ParameterizedType & o ) : Type( o ), forall() {
+                // one-level deep clone to avoid weak-reference errors
+                forall.reserve( o.forall.size() );
+                for ( const TypeDecl * d : o.forall ) { forall.emplace_back( d->clone() ); }
+        }
+
+        ParameterizedType( ParameterizedType && ) = default;
+
+        // no need to change destructor, and operator= deleted in Node
 
 private: