Changeset 7527e63 for src/ControlStruct/MLEMutator.cc

Timestamp:

Aug 16, 2016, 3:20:06 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

1f6d4624

Parents:

950f7a7 (diff), 7880579 (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/MLEMutator.cc (modified) (3 diffs)

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:36:51 2016
-// Update Count     : 197
+// Last Modified On : Thu Aug  4 11:21:32 2016
+// Update Count     : 202
 //
 
@@ -128 +128 @@
                 Label brkLabel = generator->newLabel("switchBreak");
                 enclosingControlStructures.push_back( Entry(switchStmt, brkLabel) );
-                mutateAll( switchStmt->get_branches(), *this );
+                mutateAll( switchStmt->get_statements(), *this );
 
                 Entry &e = enclosingControlStructures.back();
@@ -138 +138 @@
                         // switch should be CastStmts), append the exit label + break to the last case statement; create a default
                         // case if there are no cases
-                        std::list< Statement * > &branches = switchStmt->get_branches();
-                        if ( branches.empty() ) {
-                                branches.push_back( CaseStmt::makeDefault() );
-                        } // if
-
-                        if ( CaseStmt * c = dynamic_cast< CaseStmt * >( branches.back() ) ) {
+                        std::list< Statement * > &statements = switchStmt->get_statements();
+                        if ( statements.empty() ) {
+                                statements.push_back( CaseStmt::makeDefault() );
+                        } // if
+
+                        if ( CaseStmt * c = dynamic_cast< CaseStmt * >( statements.back() ) ) {
                                 std::list<Label> temp; temp.push_back( brkLabel );
                                 c->get_statements().push_back( new BranchStmt( temp, Label("brkLabel"), BranchStmt::Break ) );
-                        } else assert(0); // as of this point, all branches of a switch are still CaseStmts
+                        } else assert(0); // as of this point, all statements of a switch are still CaseStmts
                 } // if