Changeset 52ac3b4 for src/ControlStruct/LabelFixer.cc

Timestamp:

May 27, 2015, 5:10:09 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

86bd7c1f

Parents:

6244dfb (diff), be5aa1b (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 plg2:software/cfa/cfa-cc

File:

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

src/ControlStruct/LabelFixer.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 15:25:59 2015
-// Update Count     : 1
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed May 27 16:16:14 2015
+// Update Count     : 4
 //
 
@@ -40 +40 @@
 
         void LabelFixer::visit( FunctionDecl *functionDecl ) {
-                if ( functionDecl->get_statements() != 0 )
-                        functionDecl->get_statements()->accept( *this );
+                maybeAccept( functionDecl->get_statements(), *this );
 
                 MLEMutator mlemut( resolveJumps(), generator );
@@ -102 +101 @@
                         Entry *e = i->second;
 
-                        if ( def_us.find ( e->get_definition() ) == def_us.end() )
-                                def_us[ e->get_definition() ] = e;
-                        else
+                        if ( def_us.find ( e->get_definition() ) == def_us.end() ) {
+                                def_us[ e->get_definition() ] = e;                              
+                        } else {
                                 if ( e->used() )
                                         def_us[ e->get_definition() ]->add_uses( e->get_uses() );
+                        }
                 }