Changeset 68f9c43 for src/SymTab

Timestamp:

Mar 16, 2018, 5:15:02 PM (7 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

Location:

src/SymTab

Files:

• Autogen.cc (modified) (6 diffs)
• Autogen.h (modified) (1 diff)
• FixFunction.cc (modified) (2 diffs)
• Validate.cc (modified) (13 diffs)

src/SymTab/Autogen.cc

@@ -214 +214 @@
         void addForwardDecl( FunctionDecl * functionDecl, std::list< Declaration * > & declsToAdd ) {
                 FunctionDecl * decl = functionDecl->clone();
-                delete decl->statements;
                 decl->statements = nullptr;
                 declsToAdd.push_back( decl );
@@ -333 +332 @@
                 } catch ( SemanticErrorException err ) {
                         // okay if decl does not resolve - that means the function should not be generated
-                        delete dcl;
                 }
         }
@@ -373 +371 @@
                         // do not carry over field's attributes to parameter type
                         Type * paramType = field->get_type()->clone();
-                        deleteAll( paramType->attributes );
                         paramType->attributes.clear();
                         // add a parameter corresponding to this field
@@ -383 +380 @@
                         resolve( ctor );
                 }
-                delete memCtorType;
         }
 
@@ -511 +507 @@
                         // do not carry over field's attributes to parameter type
                         Type * paramType = field->get_type()->clone();
-                        deleteAll( paramType->attributes );
                         paramType->attributes.clear();
                         // add a parameter corresponding to this field
@@ -524 +519 @@
                         break;
                 }
-                delete memCtorType;
         }
 

src/SymTab/Autogen.h

@@ -97 +97 @@
                 // return if adding reference fails - will happen on default constructor and destructor
                 if ( isReferenceCtorDtor && ! srcParam.addReference() ) {
-                        delete fExpr;
                         return listInit;
                 }

src/SymTab/FixFunction.cc

@@ -28 +28 @@
 
         DeclarationWithType * FixFunction::postmutate(FunctionDecl *functionDecl) {
-                // can't delete function type because it may contain assertions, so transfer ownership to new object
-                ObjectDecl *pointer = new ObjectDecl( functionDecl->name, functionDecl->get_storageClasses(), functionDecl->linkage, nullptr, new PointerType( Type::Qualifiers(), functionDecl->type ), nullptr, functionDecl->attributes );
-                functionDecl->attributes.clear();
-                functionDecl->type = nullptr;
-                delete functionDecl;
-                return pointer;
+                return new ObjectDecl{ 
+                        functionDecl->name, functionDecl->get_storageClasses(), functionDecl->linkage, nullptr, 
+                        new PointerType{ Type::Qualifiers(), functionDecl->type }, 
+                        nullptr, functionDecl->attributes };
         }
 
@@ -42 +40 @@
         Type * FixFunction::postmutate(ArrayType *arrayType) {
                 // need to recursively mutate the base type in order for multi-dimensional arrays to work.
-                PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base, arrayType->dimension, arrayType->isVarLen, arrayType->isStatic );
-                arrayType->base = nullptr;
-                arrayType->dimension = nullptr;
-                delete arrayType;
-                return pointerType;
+                return new PointerType{ arrayType->get_qualifiers(), arrayType->base, arrayType->dimension, arrayType->isVarLen, arrayType->isStatic };
         }
 

src/SymTab/Validate.cc

@@ -310 +310 @@
                 } // if
                 // Always remove the hoisted aggregate from the inner structure.
-                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, isStructOrUnion, false ); } );
+                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, isStructOrUnion ); } );
         }
 
@@ -365 +365 @@
                         // one void is the only thing in the list; remove it.
                         if ( containsVoid ) {
-                                delete dwts.front();
                                 dwts.clear();
                         }
@@ -492 +491 @@
                                 }
                         }
-                        deleteAll( td->assertions );
                         td->assertions.clear();
                 } // for
@@ -608 +606 @@
                                         // expand trait instance into all of its members
                                         expandAssertions( traitInst, back_inserter( type->assertions ) );
-                                        delete traitInst;
                                 } else {
                                         // pass other assertions through
@@ -682 +679 @@
                         SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
                 }
-                filter( translationUnit, isTypedef, true );
+                filter( translationUnit, isTypedef );
         }
 
@@ -696 +693 @@
                                 ret->attributes.splice( ret->attributes.end(), typeInst->attributes );
                         } else {
-                                deleteAll( ret->attributes );
                                 ret->attributes.clear();
                         }
@@ -709 +705 @@
                                 mutateAll( rtt->parameters, *visitor );  // recursively fix typedefs on parameters
                         } // if
-                        delete typeInst;
                         return ret;
                 } else {
@@ -795 +790 @@
                 if ( FunctionType *funtype = dynamic_cast<FunctionType *>( objDecl->get_type() ) ) { // function type?
                         // replace the current object declaration with a function declaration
-                        FunctionDecl * newDecl = new FunctionDecl( objDecl->get_name(), objDecl->get_storageClasses(), objDecl->get_linkage(), funtype, 0, objDecl->get_attributes(), objDecl->get_funcSpec() );
-                        objDecl->get_attributes().clear();
-                        objDecl->set_type( nullptr );
-                        delete objDecl;
-                        return newDecl;
+                        return new FunctionDecl{ 
+                                objDecl->get_name(), objDecl->get_storageClasses(), objDecl->get_linkage(), 
+                                funtype, 0, objDecl->get_attributes(), objDecl->get_funcSpec() };
                 } // if
                 return objDecl;
@@ -823 +816 @@
                         } // if
                         return false;
-                }, true);
+                } );
                 return compoundStmt;
         }
@@ -831 +824 @@
         template<typename AggDecl>
         AggDecl *EliminateTypedef::handleAggregate( AggDecl * aggDecl ) {
-                filter( aggDecl->members, isTypedef, true );
+                filter( aggDecl->members, isTypedef );
                 return aggDecl;
         }
@@ -961 +954 @@
                 static UniqueName indexName( "_compLit" );
 
-                ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, nullptr, compLitExpr->get_result(), compLitExpr->get_initializer() );
-                compLitExpr->set_result( nullptr );
-                compLitExpr->set_initializer( nullptr );
-                delete compLitExpr;
+                ObjectDecl * tempvar = new ObjectDecl{ 
+                        indexName.newName(), storageClasses, LinkageSpec::C, nullptr, compLitExpr->get_result(), compLitExpr->get_initializer() };
                 declsToAddBefore.push_back( tempvar );                                  // add modified temporary to current block
                 return new VariableExpr( tempvar );
@@ -1000 +991 @@
                         // ensure return value is not destructed by explicitly creating an empty ListInit node wherein maybeConstruct is false.
                         ObjectDecl * newRet = new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, tupleType, new ListInit( std::list<Initializer*>(), noDesignators, false ) );
-                        deleteAll( retVals );
                         retVals.clear();
                         retVals.push_back( newRet );
@@ -1041 +1031 @@
                         if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( inner->arg ) ) {
                                 if ( labels.count( nameExpr->name ) ) {
-                                        Label name = nameExpr->name;
-                                        delete addrExpr;
-                                        return new LabelAddressExpr( name );
+                                        return new LabelAddressExpr{ nameExpr->name };
                                 }
                         }