Changeset f80e0218 for src/ControlStruct/LabelFixer.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

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

src/ControlStruct/LabelFixer.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelFixer.cc -- 
+// LabelFixer.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -86 +86 @@
 
 
-        // sets the definition of the labelTable entry to be the provided 
+        // sets the definition of the labelTable entry to be the provided
         // statement for every label in the list parameter. Happens for every kind of statement
         Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
@@ -95 +95 @@
 
                 for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
-                        if ( labelTable.find( *i ) == labelTable.end() ) {
+                        Label & l = *i;
+                        l.set_statement( definition ); // attach statement to the label to be used later
+                        if ( labelTable.find( l ) == 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 ] =  e;
-                        } else if ( labelTable[ *i ]->defined() ) {
+                                labelTable[ l ] =  e;
+                        } else if ( labelTable[ l ]->defined() ) {
                                 // defined twice, error
-                                throw SemanticError( "Duplicate definition of label: " + *i );
+                                throw SemanticError( "Duplicate definition of label: " + l.get_name() );
                         }       else {
                                 // used previously, but undefined until now -> link with this entry
-                                delete labelTable[ *i ];
-                                labelTable[ *i ] = e;
+                                delete labelTable[ l ];
+                                labelTable[ l ] = e;
                         } // if
                 } // for
 
-                // produce one of the labels attached to this statement to be 
+                // produce one of the labels attached to this statement to be
                 // temporarily used as the canonical label
                 return labelTable[ llabel.front() ]->get_label();
         }
 
-        // A label was used, add it ot the table if it isn't already there
+        // A label was used, add it to the table if it isn't already there
         template< typename UsageNode >
         void LabelFixer::setLabelsUsg( Label orgValue, UsageNode *use ) {
@@ -130 +132 @@
                 for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {
                         if ( ! i->second->defined() ) {
-                                throw SemanticError( "Use of undefined label: " + i->first );
+                                throw SemanticError( "Use of undefined label: " + i->first.get_name() );
                         }
                         (*ret)[ i->first ] = i->second->get_definition();