Changeset 6635c74 for src/GenPoly

Timestamp:

Mar 7, 2016, 1:37:42 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

4e284ea6

Parents:

2e60a1a

Message:

Switched GenPoly::Pass1.adapters over to non-copying ScopedMap? from copying stack of std::map

File:

• src/GenPoly/Box.cc (modified) (6 diffs)

src/GenPoly/Box.cc

@@ -26 +26 @@
 #include "PolyMutator.h"
 #include "FindFunction.h"
+#include "ScopedMap.h"
 #include "ScrubTyVars.h"
 
@@ -112 +113 @@
                         ObjectDecl *makeTemporary( Type *type );
 
-                        typedef std::map< std::string, DeclarationWithType *> AdapterMap;
                         std::map< std::string, DeclarationWithType *> assignOps;
                         ResolvExpr::TypeMap< DeclarationWithType > scopedAssignOps;
-                        std::stack< AdapterMap > adapters;
+                        ScopedMap< std::string, DeclarationWithType* > adapters;
                         DeclarationWithType *retval;
                         bool useRetval;
@@ -448 +448 @@
                 }
 
-                Pass1::Pass1() : useRetval( false ), tempNamer( "_temp" ) {
-                        adapters.push(AdapterMap());
-                }
+                Pass1::Pass1() : useRetval( false ), tempNamer( "_temp" ) {}
 
                 /// Returns T if the given declaration is (*?=?)(T *, T) for some TypeInstType T (return not checked, but maybe should be), NULL otherwise
@@ -553 +551 @@
                                 } // for
 
-                                AdapterMap & adapters = Pass1::adapters.top();
                                 for ( std::list< FunctionType *>::iterator funType = functions.begin(); funType != functions.end(); ++funType ) {
                                         std::string mangleName = mangleAdapterName( *funType, scopeTyVars );
@@ -975 +972 @@
                                         mangleName += makePolyMonoSuffix( originalFunction, exprTyVars );
 
-                                        AdapterMap & adapters = Pass1::adapters.top();
-                                        AdapterMap::iterator adapter = adapters.find( mangleName );
+                                        typedef ScopedMap< std::string, DeclarationWithType* >::iterator AdapterIter;
+                                        AdapterIter adapter = adapters.find( mangleName );
                                         if ( adapter == adapters.end() ) {
                                                 // adapter has not been created yet in the current scope, so define it
                                                 FunctionDecl *newAdapter = makeAdapter( *funType, realFunction, mangleName, exprTyVars );
-                                                adapter = adapters.insert( adapters.begin(), std::pair< std::string, DeclarationWithType *>( mangleName, newAdapter ) );
+                                                std::pair< AdapterIter, bool > answer = adapters.insert( std::pair< std::string, DeclarationWithType *>( mangleName, newAdapter ) );
+                                                adapter = answer.first;
                                                 stmtsToAdd.push_back( new DeclStmt( noLabels, newAdapter ) );
                                         } // if
@@ -1359 +1357 @@
 
                 void Pass1::doBeginScope() {
-                        // push a copy of the current map
-                        adapters.push(adapters.top());
+                        adapters.beginScope();
                         scopedAssignOps.beginScope();
                 }
 
                 void Pass1::doEndScope() {
-                        adapters.pop();
+                        adapters.endScope();
                         scopedAssignOps.endScope();
                 }