Changeset 68f9c43 for src/InitTweak/FixInit.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/InitTweak/FixInit.cc (modified) (8 diffs)

src/InitTweak/FixInit.cc

@@ -454 +454 @@
                                 resolved->env = nullptr;
                         } // if
-                        delete stmt;
                         if ( TupleAssignExpr * assign = dynamic_cast< TupleAssignExpr * >( resolved ) ) {
                                 // fix newly generated StmtExpr
@@ -554 +553 @@
                                 result = result->clone();
                                 env->apply( result );
-                                if ( ! InitTweak::isConstructable( result ) ) {
-                                        delete result;
-                                        return;
-                                }
+                                if ( ! InitTweak::isConstructable( result ) ) return;
 
                                 // create variable that will hold the result of the stmt expr
@@ -652 +648 @@
                         std::swap( impCpCtorExpr->env, callExpr->env );
                         assert( impCpCtorExpr->env == nullptr );
-                        delete impCpCtorExpr;
 
                         if ( returnDecl ) {
@@ -711 +706 @@
                         if ( unqMap.count( unqExpr->get_id() ) ) {
                                 // take data from other UniqueExpr to ensure consistency
-                                delete unqExpr->get_expr();
                                 unqExpr->set_expr( unqMap[unqExpr->get_id()]->get_expr()->clone() );
-                                delete unqExpr->get_result();
                                 unqExpr->set_result( maybeClone( unqExpr->get_expr()->get_result() ) );
                                 if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
@@ -824 +817 @@
                                                         // create a new object which is never used
                                                         static UniqueName dummyNamer( "_dummy" );
-                                                        ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), Type::StorageClasses( Type::Static ), LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
-                                                        delete ctorInit;
-                                                        return dummy;
+                                                        return new ObjectDecl{
+                                                                dummyNamer.newName(), Type::StorageClasses( Type::Static ), LinkageSpec::Cforall, 0, 
+                                                                new PointerType{ Type::Qualifiers(), new VoidType( Type::Qualifiers() ) }, 
+                                                                0, std::list< Attribute * >{ new Attribute("unused") } };
                                                 }
                                         } else {
@@ -852 +846 @@
                                         objDecl->init = nullptr;
                                 } // if
-                                delete ctorInit;
                         } // if
                         return objDecl;
@@ -1228 +1221 @@
                         ObjectDecl * tmp = ObjectDecl::newObject( tempNamer.newName(), callExpr->args.front()->result->clone(), nullptr );
                         declsToAddBefore.push_back( tmp );
-                        delete ctorExpr;
 
                         // build assignment and replace constructor's first argument with new temporary
@@ -1237 +1229 @@
                         // resolve assignment and dispose of new env
                         ResolvExpr::findVoidExpression( assign, indexer );
-                        delete assign->env;
                         assign->env = nullptr;