Changeset 32a2a99 for src/SymTab/Validate.cc

Timestamp:

Aug 30, 2016, 4:25:55 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

90e2334, fa463f1

Parents:

a2a8d2a6 (diff), ced2e989 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

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

src/SymTab/Validate.cc

@@ -49 +49 @@
 #include "SynTree/Statement.h"
 #include "SynTree/TypeSubstitution.h"
+#include "GenPoly/ScopedMap.h"
 #include "Indexer.h"
 #include "FixFunction.h"
@@ -162 +163 @@
                 void addImplicitTypedef( AggDecl * aggDecl );
 
-                typedef std::map< std::string, std::pair< TypedefDecl *, int > > TypedefMap;
+                typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
+                typedef GenPoly::ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
                 typedef std::map< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;
@@ -531 +533 @@
                         TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
                         assert( base != typedeclNames.end() );
-                        typeInst->set_baseType( base->second->clone() );
+                        typeInst->set_baseType( base->second );
                 } // if
                 return typeInst;
@@ -549 +551 @@
                         }
                 } else {
-                        typedefNames[ tyDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
+                        typedefNames[ tyDecl->get_name() ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
                 } // if
 
@@ -567 +569 @@
                         return new EnumDecl( enumDecl->get_name() );
                 } else {
-                        return ret;
+                        return ret->clone();
                 } // if
         }
@@ -582 +584 @@
 
         DeclarationWithType *EliminateTypedef::mutate( FunctionDecl * funcDecl ) {
-                TypedefMap oldNames = typedefNames;
+                typedefNames.beginScope();
                 DeclarationWithType *ret = Mutator::mutate( funcDecl );
-                typedefNames = oldNames;
+                typedefNames.endScope();
                 return ret;
         }
 
         DeclarationWithType *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
-                TypedefMap oldNames = typedefNames;
+                typedefNames.beginScope();
                 DeclarationWithType *ret = Mutator::mutate( objDecl );
-                typedefNames = oldNames;
+                typedefNames.endScope();
                 // is the type a function?
                 if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
@@ -603 +605 @@
 
         Expression *EliminateTypedef::mutate( CastExpr * castExpr ) {
-                TypedefMap oldNames = typedefNames;
+                typedefNames.beginScope();
                 Expression *ret = Mutator::mutate( castExpr );
-                typedefNames = oldNames;
+                typedefNames.endScope();
                 return ret;
         }
 
         CompoundStmt *EliminateTypedef::mutate( CompoundStmt * compoundStmt ) {
-                TypedefMap oldNames = typedefNames;
+                typedefNames.beginScope();
                 scopeLevel += 1;
                 CompoundStmt *ret = Mutator::mutate( compoundStmt );
@@ -625 +627 @@
                         i = next;
                 } // while
-                typedefNames = oldNames;
+                typedefNames.endScope();
                 return ret;
         }
@@ -656 +658 @@
                                 type = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() );
                         } // if
-                        TypedefDecl * tyDecl = new TypedefDecl( aggDecl->get_name(), DeclarationNode::NoStorageClass, type );
-                        typedefNames[ aggDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
+                        TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), DeclarationNode::NoStorageClass, type ) );
+                        typedefNames[ aggDecl->get_name() ] = std::make_pair( std::move( tyDecl ), scopeLevel );
                 } // if
         }