Changeset 68f9c43 for src/GenPoly/InstantiateGeneric.cc

Timestamp:

Mar 16, 2018, 5:15:02 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

8d7bef2

Parents:

6171841

git-author:

Aaron Moss <a3moss@…> (03/16/18 17:04:24)

git-committer:

Aaron Moss <a3moss@…> (03/16/18 17:15:02)

Message:

First pass at delete removal

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (10 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -58 +58 @@
 
                 TypeList& operator= ( const TypeList &that ) {
-                        deleteAll( params );
-
                         params.clear();
                         cloneAll( that.params, params );
@@ -67 +65 @@
 
                 TypeList& operator= ( TypeList &&that ) {
-                        deleteAll( params );
-
                         params = std::move( that.params );
 
@@ -74 +70 @@
                 }
 
-                ~TypeList() { deleteAll( params ); }
+                ~TypeList() {}
 
                 bool operator== ( const TypeList& that ) const {
@@ -293 +289 @@
         /// Strips the instances's type parameters
         void stripInstParams( ReferenceToType *inst ) {
-                deleteAll( inst->get_parameters() );
                 inst->get_parameters().clear();
         }
@@ -300 +295 @@
                 substituteMembers( base->get_members(), baseParams, typeSubs );
 
-                // xxx - can't delete type parameters because they may have assertions that are used
-                // deleteAll( baseParams );
                 baseParams.clear();
 
@@ -380 +373 @@
                         newInst->set_baseStruct( concDecl );
 
-                        delete inst;
                         inst = newInst;
                         break;
@@ -390 +382 @@
                 }
 
-                deleteAll( typeSubs );
                 return inst;
         }
@@ -430 +421 @@
                         newInst->set_baseUnion( concDecl );
 
-                        delete inst;
                         inst = newInst;
                         break;
@@ -439 +429 @@
                 }
 
-                deleteAll( typeSubs );
                 return inst;
         }
@@ -477 +466 @@
                         ResolvExpr::adjustExprType( ret->result ); // pointer decay
                         std::swap( ret->env, memberExpr->env );
-                        delete memberExpr;
                         return ret;
                 }