Changeset 2c187378 for src/ResolvExpr/Alternative.cc

Timestamp:

Oct 17, 2018, 4:16:18 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

fbecee5

Parents:

da48183

Message:

Fix memory bugs in deferred resolution

File:

• src/ResolvExpr/Alternative.cc (modified) (4 diffs)

src/ResolvExpr/Alternative.cc

@@ -20 +20 @@
 #include <utility>                       // for move
 
-#include "Common/utility.h"              // for maybeClone
+#include "Common/utility.h"              // for cloneAll
 #include "ResolvExpr/Cost.h"             // for Cost, Cost::zero, operator<<
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
@@ -35 +35 @@
         Alternative::Alternative( const Alternative &o, Expression *expr, const Cost &cost ) 
         : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( o.env ), openVars( o.openVars ), 
-          need( o.need ) {}
+          need() { cloneAll( o.need, need ); }
 
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, 
-                const OpenVarSet& openVars, const AssertionList& need, const Cost& cost )
+                const OpenVarSet& openVars, const AssertionList& oneed, const Cost& cost )
         : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( env ), openVars( openVars ), 
-          need( need ) {}
+          need() { cloneAll( oneed, need ); }
 
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, 
-                const OpenVarSet& openVars, const AssertionList& need, const Cost& cost, 
+                const OpenVarSet& openVars, const AssertionList& oneed, const Cost& cost, 
                 const Cost &cvtCost )
         : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ), openVars( openVars ), 
-          need( need ) {}
+          need() { cloneAll( oneed, need ); }
+        
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, 
+                const OpenVarSet &openVars, const AssertionSet &oneed, const Cost &cost)
+        : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( env ), openVars( openVars ), 
+          need() { cloneAll( oneed, need ); }
+        
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, 
+                const OpenVarSet &openVars, const AssertionSet &oneed, const Cost &cost, 
+                const Cost& cvtCost )
+        : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ), openVars( openVars ), 
+          need() { cloneAll( oneed, need ); }
+        
+        Alternative::Alternative( Expression *expr, TypeEnvironment &&env, OpenVarSet &&openVars, 
+                AssertionSet &&needSet, const Cost &cost )
+        : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( std::move(env) ), 
+          openVars( std::move(openVars) ), need( needSet.begin(), needSet.end() ) {}
+        
+        Alternative::Alternative( Expression *expr, TypeEnvironment &&env, OpenVarSet &&openVars, 
+                AssertionSet &&needSet, const Cost &cost, const Cost &cvtCost )
+        : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( std::move(env) ), 
+          openVars( std::move(openVars) ), need( needSet.begin(), needSet.end() ) {}
 
         Alternative::Alternative( const Alternative &other ) 
         : cost( other.cost ), cvtCost( other.cvtCost ), expr( maybeClone( other.expr ) ), 
-          env( other.env ), openVars( other.openVars ), need( other.need ) {}
+          env( other.env ), openVars( other.openVars ), need() { cloneAll( other.need, need ); }
 
         Alternative &Alternative::operator=( const Alternative &other ) {
@@ -60 +81 @@
                 env = other.env;
                 openVars = other.openVars;
-                need = other.need;
+                need.clear();
+                cloneAll( other.need, need );
                 return *this;
         }
@@ -67 +89 @@
         : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), 
           env( std::move( other.env ) ), openVars( std::move( other.openVars ) ), 
-          need( std::move( other.need ) ) {
-                other.expr = nullptr;
-        }
+          need( std::move( other.need ) ) { other.expr = nullptr; }
 
         Alternative & Alternative::operator=( Alternative && other ) {