Changeset 1048b31 for src/GenPoly/FindFunction.cc

Timestamp:

May 2, 2016, 3:28:16 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, 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, with_gc

Children:

1b7ea43

Parents:

1f6e009 (diff), e945826 (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' into global-init

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 );
+                                tyVars.erase( var->first );
                         } // if
                 } // for
@@ -61 +61 @@
 
         Type * FindFunction::mutate( FunctionType *functionType ) {
-                TyVarMap oldTyVars = tyVars;
+                tyVars.beginScope();
                 handleForall( functionType->get_forall() );
                 mutateAll( functionType->get_returnVals(), *this );
@@ -72 +72 @@
                         } // if
                 } // if
-                tyVars = oldTyVars;
+                tyVars.endScope();
                 return ret;
         }
 
         Type * FindFunction::mutate( PointerType *pointerType ) {
-                TyVarMap oldTyVars = tyVars;
+                tyVars.beginScope();
                 handleForall( pointerType->get_forall() );
                 Type *ret = Mutator::mutate( pointerType );
-                tyVars = oldTyVars;
+                tyVars.endScope();
                 return ret;
         }