Changes in src/ControlStruct/LabelFixer.cc [1fbeebd:d180746]

File:

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

src/ControlStruct/LabelFixer.cc

@@ -37 +37 @@
         }
 
-        void LabelFixer::previsit( FunctionDecl * ) {
+        void LabelFixer::visit( FunctionDecl *functionDecl ) {
                 // need to go into a nested function in a fresh state
-                GuardValue( labelTable );
+                std::map < Label, Entry *> oldLabelTable = labelTable;
                 labelTable.clear();
-        }
 
-        void LabelFixer::postvisit( FunctionDecl * functionDecl ) {
+                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;
         }
 
         // prune to at most one label definition for each statement
-        void LabelFixer::previsit( Statement *stmt ) {
+        void LabelFixer::visit( Statement *stmt ) {
                 std::list< Label > &labels = stmt->get_labels();
 
@@ -58 +62 @@
         }
 
-        void LabelFixer::previsit( BranchStmt *branchStmt ) {
-                previsit( ( Statement *)branchStmt );
+        void LabelFixer::visit( BranchStmt *branchStmt ) {
+                visit ( ( Statement * )branchStmt );
 
                 // for labeled branches, add an entry to the label table
@@ -68 +72 @@
         }
 
-        void LabelFixer::previsit( LabelAddressExpr * addrExpr ) {
-                Label & target = addrExpr->arg;
-                assert( target != "" );
-                setLabelsUsg( target, addrExpr );
+        void LabelFixer::visit( UntypedExpr *untyped ) {
+                if ( NameExpr * func = dynamic_cast< NameExpr * >( untyped->get_function() ) ) {
+                        if ( func->get_name() == "&&" ) {
+                                NameExpr * arg = dynamic_cast< NameExpr * >( untyped->get_args().front() );
+                                Label target = arg->get_name();
+                                assert( target != "" );
+                                setLabelsUsg( target, untyped );
+                        } else {
+                                Visitor::visit( untyped );
+                        }
+                }
         }