Changeset cff1143 for src/ControlStruct

Timestamp:

Jul 9, 2015, 3:07:32 PM (10 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:

0215a76f, dfee306

Parents:

82dd287 (diff), e5609dd (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:software/cfa/cfa-cc

File:

• src/ControlStruct/LabelFixer.cc (modified) (2 diffs)

src/ControlStruct/LabelFixer.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 24 16:24:34 2015
-// Update Count     : 141
+// Last Modified On : Wed Jul 08 12:36:46 2015
+// Update Count     : 145
 //
 
@@ -61 +61 @@
 
         void LabelFixer::visit( FunctionDecl *functionDecl ) {
+                // need to go into a nested function in a fresh state
+                std::map < Label, Entry *> oldLabelTable = labelTable;
+                labelTable.clear();
+
                 maybeAccept( functionDecl->get_statements(), *this );
 
                 MLEMutator mlemut( resolveJumps(), generator );
                 functionDecl->acceptMutator( mlemut );
+
+                // and remember the outer function's labels when
+                // returning to it
+                labelTable = oldLabelTable;
         }