Changeset 154fdc8 for src/ControlStruct/LabelGenerator.cc

Timestamp:

Apr 19, 2017, 10:15:45 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

cd348e7

Parents:

221c2de7 (diff), de4ce0e (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/LabelGenerator.cc (modified) (2 diffs)

src/ControlStruct/LabelGenerator.cc

@@ -20 +20 @@
 #include "SynTree/Label.h"
 #include "SynTree/Attribute.h"
+#include "SynTree/Statement.h"
 
 namespace ControlStruct {
@@ -31 +32 @@
         }
 
-        Label LabelGenerator::newLabel( std::string suffix ) {
+        Label LabelGenerator::newLabel( std::string suffix, Statement * stmt ) {
                 std::ostringstream os;
                 os << "__L" << current++ << "__" << suffix;
+                if ( stmt && ! stmt->get_labels().empty() ) {
+                        os << "_" << stmt->get_labels().front() << "__";
+                }
                 std::string ret = os.str();
                 Label l( ret );