Changes in src/SymTab/Validate.cc [42107b4:25fcb84]

File:

• src/SymTab/Validate.cc (modified) (19 diffs)

src/SymTab/Validate.cc

@@ -48 +48 @@
 #include "CodeGen/CodeGenerator.h"     // for genName
 #include "CodeGen/OperatorTable.h"     // for isCtorDtor, isCtorDtorAssign
-#include "Common/GC.h"                 // for new_static_root, register_static_root
+#include "ControlStruct/Mutate.h"      // for ForExprMutator
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
@@ -77 +77 @@
 class SwitchStmt;
 
-
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }
 
@@ -200 +199 @@
                 void addImplicitTypedef( AggDecl * aggDecl );
 
-                typedef ScopedMap< std::string, std::pair< TypedefDecl*, int > > TypedefMap;
+                typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
+                typedef ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
                 typedef std::map< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;
@@ -275 +275 @@
                 Concurrency::applyKeywords( translationUnit );
                 acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
+                ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
                 Concurrency::implementMutexFuncs( translationUnit );
@@ -312 +313 @@
                 } // if
                 // Always remove the hoisted aggregate from the inner structure.
-                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, shouldHoist ); } );
+                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, shouldHoist, false ); } );
         }
 
@@ -373 +374 @@
                         // one void is the only thing in the list; remove it.
                         if ( containsVoid ) {
+                                delete dwts.front();
                                 dwts.clear();
                         }
@@ -499 +501 @@
                                 }
                         }
+                        deleteAll( td->assertions );
                         td->assertions.clear();
                 } // for
@@ -614 +617 @@
                                         // expand trait instance into all of its members
                                         expandAssertions( traitInst, back_inserter( type->assertions ) );
+                                        delete traitInst;
                                 } else {
                                         // pass other assertions through
@@ -685 +689 @@
                         // grab and remember declaration of size_t
                         SizeType = eliminator.pass.typedefNames["size_t"].first->get_base()->clone();
-                        GC::get().register_static_root( SizeType );
                 } else {
                         // xxx - missing global typedef for size_t - default to long unsigned int, even though that may be wrong
                         // eventually should have a warning for this case.
-                        SizeType = 
-                                new_static_root<BasicType>( Type::Qualifiers(), BasicType::LongUnsignedInt );
-                }
-                filter( translationUnit, isTypedef );
+                        SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+                }
+                filter( translationUnit, isTypedef, true );
         }
 
@@ -706 +708 @@
                                 ret->attributes.splice( ret->attributes.end(), typeInst->attributes );
                         } else {
+                                deleteAll( ret->attributes );
                                 ret->attributes.clear();
                         }
@@ -718 +721 @@
                                 mutateAll( rtt->parameters, *visitor );  // recursively fix typedefs on parameters
                         } // if
+                        delete typeInst;
                         return ret;
                 } else {
@@ -759 +763 @@
                         }
                 } else {
-                        typedefNames[ tyDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
+                        typedefNames[ tyDecl->get_name() ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
                 } // if
 
@@ -803 +807 @@
                 if ( FunctionType *funtype = dynamic_cast<FunctionType *>( objDecl->get_type() ) ) { // function type?
                         // replace the current object declaration with a function declaration
-                        return new FunctionDecl{ 
-                                objDecl->get_name(), objDecl->get_storageClasses(), objDecl->get_linkage(), 
-                                funtype, 0, objDecl->get_attributes(), objDecl->get_funcSpec() };
+                        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;
                 } // if
                 return objDecl;
@@ -829 +835 @@
                         } // if
                         return false;
-                } );
+                }, true);
                 return compoundStmt;
         }
@@ -837 +843 @@
         template<typename AggDecl>
         AggDecl *EliminateTypedef::handleAggregate( AggDecl * aggDecl ) {
-                filter( aggDecl->members, isTypedef );
+                filter( aggDecl->members, isTypedef, true );
                 return aggDecl;
         }
@@ -852 +858 @@
                                 type = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() );
                         } // if
-                        TypedefDecl* tyDecl = new TypedefDecl{ aggDecl->get_name(), aggDecl->location, Type::StorageClasses(), type, aggDecl->get_linkage() };
-                        typedefNames[ aggDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
+                        TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), aggDecl->location, Type::StorageClasses(), type, aggDecl->get_linkage() ) );
+                        typedefNames[ aggDecl->get_name() ] = std::make_pair( std::move( tyDecl ), scopeLevel );
                 } // if
         }
@@ -967 +973 @@
                 static UniqueName indexName( "_compLit" );
 
-                ObjectDecl * tempvar = new ObjectDecl{ 
-                        indexName.newName(), storageClasses, LinkageSpec::C, nullptr, compLitExpr->get_result(), compLitExpr->get_initializer() };
+                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;
                 declsToAddBefore.push_back( tempvar );                                  // add modified temporary to current block
                 return new VariableExpr( tempvar );
@@ -1004 +1012 @@
                         // 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 );
@@ -1044 +1053 @@
                         if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( inner->arg ) ) {
                                 if ( labels.count( nameExpr->name ) ) {
-                                        return new LabelAddressExpr{ nameExpr->name };
+                                        Label name = nameExpr->name;
+                                        delete addrExpr;
+                                        return new LabelAddressExpr( name );
                                 }
                         }