Changes in src/GenPoly/FindFunction.cc [6f49cdf:b4cd03b7]

File:

• src/GenPoly/FindFunction.cc (modified) (3 diffs)

src/GenPoly/FindFunction.cc

@@ -55 +55 @@
                         TyVarMap::iterator var = tyVars.find( (*i)->get_name() );
                         if ( var != tyVars.end() ) {
-                                tyVars.erase( var->first );
+                                tyVars.erase( var );
                         } // if
                 } // for
@@ -61 +61 @@
 
         Type * FindFunction::mutate( FunctionType *functionType ) {
-                tyVars.beginScope();
+                TyVarMap oldTyVars = tyVars;
                 handleForall( functionType->get_forall() );
                 mutateAll( functionType->get_returnVals(), *this );
@@ -72 +72 @@
                         } // if
                 } // if
-                tyVars.endScope();
+                tyVars = oldTyVars;
                 return ret;
         }
 
         Type * FindFunction::mutate( PointerType *pointerType ) {
-                tyVars.beginScope();
+                TyVarMap oldTyVars = tyVars;
                 handleForall( pointerType->get_forall() );
                 Type *ret = Mutator::mutate( pointerType );
-                tyVars.endScope();
+                tyVars = oldTyVars;
                 return ret;
         }