Changeset b2152e7a

Timestamp:

Jun 2, 2015, 1:42:10 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:

d939274

Parents:

2b6c1e0

Message:

fix MLE hack that puts a dangling break statement outside of a case statement in a switch

Location:

src

Files:

• ControlStruct/MLEMutator.cc (modified) (2 diffs)
• SynTree/Statement.cc (modified) (2 diffs)
• SynTree/Statement.h (modified) (2 diffs)

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 27 16:19:32 2015
-// Update Count     : 44
+// Last Modified On : Tue Jun 02 13:35:49 2015
+// Update Count     : 91
 //
 
@@ -154 +154 @@
                 Label brkLabel = generator->newLabel();
                 enclosingSwitches.push_back( Entry(switchStmt, "", brkLabel) );
-                mutateAll( switchStmt->get_branches(), mutator ); {
+                mutateAll( switchStmt->get_branches(), mutator ); 
+                {
                         // check if this is necessary (if there is a break to this point, otherwise do not generate
-                        std::list<Label> temp; temp.push_back( brkLabel );
-                        switchStmt->get_branches().push_back( new BranchStmt( temp, Label(""), BranchStmt::Break ) );
+
+                        // for the purposes of keeping switch statements uniform (i.e. all statements that are 
+                        // direct children of a 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 ( CaseStmt * c = dynamic_cast< CaseStmt * >( branches.back() ) ) {
+                                std::list<Label> temp; temp.push_back( brkLabel );
+                                c->get_statements().push_back( new BranchStmt( temp, Label(""), BranchStmt::Break ) );
+                        } else assert(0);
                 }
                 assert ( enclosingSwitches.back() == switchStmt );

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 27 15:41:13 2015
-// Update Count     : 8
+// Last Modified On : Tue Jun 02 13:07:09 2015
+// Update Count     : 14
 //
 
@@ -124 +124 @@
 CaseStmt::~CaseStmt() {
         delete condition;
+}
+
+CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> branches ) {
+        return new CaseStmt( labels, 0, branches, true );
 }
 

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 27 15:40:43 2015
-// Update Count     : 5
+// Last Modified On : Tue Jun 02 13:07:25 2015
+// Update Count     : 13
 //
 
@@ -149 +149 @@
               std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
         virtual ~CaseStmt();
+
+        static CaseStmt * makeDefault( std::list<Label> labels = std::list<Label>(),
+                std::list<Statement *> stmts = std::list<Statement *>() );
 
         bool isDefault() { return _isDefault; }