Changeset 954463b8

Timestamp:

Jun 2, 2015, 3:31:41 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, string, with_gc

Children:

27de955

Parents:

4eb1db6

Message:

fix label forward referencesC

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 : Fri May 29 15:57:12 2015
-// Update Count     : 82
+// Last Modified On : Tue Jun 02 15:30:32 2015
+// Update Count     : 93
 //
 
@@ -76 +76 @@
                 assert( llabel.size() > 0 );
 
+                Entry * e = new Entry( definition );
+
                 for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
-                        if ( labelTable.find( *i ) == labelTable.end() ) { 
+                        if ( labelTable.find( *i ) == labelTable.end() ) {
+                                // all labels on this statement need to use the same entry, so this should only be created once
                                 // undefined and unused until now, add an entry
-                                labelTable[ *i ] =  new Entry( definition ); 
-                        } else if ( labelTable[ *i ]->defined() ) {\
+                                labelTable[ *i ] =  e;
+                        } else if ( labelTable[ *i ]->defined() ) {
                                 // defined twice, error
                                 throw SemanticError( "Duplicate definition of label: " + *i );
                         }       else {
-                                // used previously, but undefined until now -> set its definition to this location
-                                labelTable[ *i ]->set_definition( definition );
+                                // used previously, but undefined until now -> link with this entry
+                                Entry * oldEntry = labelTable[ *i ];
+                                e->add_uses( oldEntry->get_uses() );
+                                labelTable[ *i ] = e;
                         } // if
                 } // for