Changes in src/ControlStruct/MLEMutator.cc [9d6317f:720a007]

File:

• src/ControlStruct/MLEMutator.cc (modified) (12 diffs)

src/ControlStruct/MLEMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Jan 22 11:50:00 2020
-// Update Count     : 223
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Mar  8 17:08:25 2018
+// Update Count     : 219
 //
 
@@ -33 +33 @@
 
 namespace ControlStruct {
-        MultiLevelExitMutator::~MultiLevelExitMutator() {
+        MLEMutator::~MLEMutator() {
                 delete targetTable;
                 targetTable = 0;
         }
         namespace {
-                bool isLoop( const MultiLevelExitMutator::Entry & e ) {
-                        return dynamic_cast< WhileStmt * >( e.get_controlStructure() )
-                                || dynamic_cast< ForStmt * >( e.get_controlStructure() );
-                }
-                bool isSwitch( const MultiLevelExitMutator::Entry & e ) {
-                        return dynamic_cast< SwitchStmt *>( e.get_controlStructure() );
-                }
-
-                bool isBreakTarget( const MultiLevelExitMutator::Entry & e ) {
-                        return isLoop( e ) || isSwitch( e )
-                                || dynamic_cast< CompoundStmt *>( e.get_controlStructure() );
-                }
-                bool isContinueTarget( const MultiLevelExitMutator::Entry & e ) {
-                        return isLoop( e );
-                }
-                bool isFallthroughTarget( const MultiLevelExitMutator::Entry & e ) {
-                        return dynamic_cast< CaseStmt *>( e.get_controlStructure() );
-                }
-                bool isFallthroughDefaultTarget( const MultiLevelExitMutator::Entry & e ) {
-                        return isSwitch( e );
-                }
+                bool isLoop( const MLEMutator::Entry & e ) { return dynamic_cast< WhileStmt * >( e.get_controlStructure() ) || dynamic_cast< ForStmt * >( e.get_controlStructure() ); }
+                bool isSwitch( const MLEMutator::Entry & e ) { return dynamic_cast< SwitchStmt *>( e.get_controlStructure() ); }
+
+                bool isBreakTarget( const MLEMutator::Entry & e ) { return isLoop( e ) || isSwitch( e ) || dynamic_cast< CompoundStmt *>( e.get_controlStructure() ); }
+                bool isContinueTarget( const MLEMutator::Entry & e ) { return isLoop( e ); }
+                bool isFallthroughTarget( const MLEMutator::Entry & e ) { return dynamic_cast< CaseStmt *>( e.get_controlStructure() );; }
+                bool isFallthroughDefaultTarget( const MLEMutator::Entry & e ) { return isSwitch( e ); }
         } // namespace
-
-        void MultiLevelExitMutator::premutate( FunctionDecl * ) {
-                visit_children = false;
-        }
 
         // break labels have to come after the statement they break out of, so mutate a statement, then if they inform us
         // through the breakLabel field tha they need a place to jump to on a break statement, add the break label to the
         // body of statements
-        void MultiLevelExitMutator::fixBlock( std::list< Statement * > &kids, bool caseClause ) {
+        void MLEMutator::fixBlock( std::list< Statement * > &kids, bool caseClause ) {
                 SemanticErrorException errors;
 
@@ -99 +81 @@
         }
 
-        void MultiLevelExitMutator::premutate( CompoundStmt *cmpndStmt ) {
+        void MLEMutator::premutate( CompoundStmt *cmpndStmt ) {
                 visit_children = false;
                 bool labeledBlock = !(cmpndStmt->labels.empty());
@@ -136 +118 @@
                         }
                 }
-                assertf( false, "Could not find label '%s' on statement %s",
-                        originalTarget.get_name().c_str(), toString( stmt ).c_str() );
-        }
-
-
-        Statement *MultiLevelExitMutator::postmutate( BranchStmt *branchStmt )
-                        throw ( SemanticErrorException ) {
+                assertf( false, "Could not find label '%s' on statement %s", originalTarget.get_name().c_str(), toString( stmt ).c_str() );
+        }
+
+
+        Statement *MLEMutator::postmutate( BranchStmt *branchStmt ) throw ( SemanticErrorException ) {
                 std::string originalTarget = branchStmt->originalTarget;
 
@@ -250 +230 @@
         }
 
-        Statement *MultiLevelExitMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
+        Statement *MLEMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
+                // ensure loop body is a block
+                CompoundStmt *newBody;
+                if ( ! (newBody = dynamic_cast<CompoundStmt *>( bodyLoop )) ) {
+                        newBody = new CompoundStmt();
+                        newBody->get_kids().push_back( bodyLoop );
+                } // if
+
                 // only generate these when needed
-                if( !e.isContUsed() && !e.isBreakUsed() ) return bodyLoop;
-
-                // ensure loop body is a block
-                CompoundStmt * newBody = new CompoundStmt();
-                newBody->get_kids().push_back( bodyLoop );
 
                 if ( e.isContUsed() ) {
@@ -273 +255 @@
 
         template< typename LoopClass >
-        void MultiLevelExitMutator::prehandleLoopStmt( LoopClass * loopStmt ) {
+        void MLEMutator::prehandleLoopStmt( LoopClass * loopStmt ) {
                 // remember this as the most recent enclosing loop, then mutate the body of the loop -- this will determine
                 // whether brkLabel and contLabel are used with branch statements and will recursively do the same to nested
@@ -284 +266 @@
 
         template< typename LoopClass >
-        Statement * MultiLevelExitMutator::posthandleLoopStmt( LoopClass * loopStmt ) {
+        Statement * MLEMutator::posthandleLoopStmt( LoopClass * loopStmt ) {
                 assert( ! enclosingControlStructures.empty() );
                 Entry &e = enclosingControlStructures.back();
@@ -295 +277 @@
         }
 
-        void MultiLevelExitMutator::premutate( WhileStmt * whileStmt ) {
+        void MLEMutator::premutate( WhileStmt * whileStmt ) {
                 return prehandleLoopStmt( whileStmt );
         }
 
-        void MultiLevelExitMutator::premutate( ForStmt * forStmt ) {
+        void MLEMutator::premutate( ForStmt * forStmt ) {
                 return prehandleLoopStmt( forStmt );
         }
 
-        Statement * MultiLevelExitMutator::postmutate( WhileStmt * whileStmt ) {
+        Statement * MLEMutator::postmutate( WhileStmt * whileStmt ) {
                 return posthandleLoopStmt( whileStmt );
         }
 
-        Statement * MultiLevelExitMutator::postmutate( ForStmt * forStmt ) {
+        Statement * MLEMutator::postmutate( ForStmt * forStmt ) {
                 return posthandleLoopStmt( forStmt );
         }
 
-        void MultiLevelExitMutator::premutate( IfStmt * ifStmt ) {
+        void MLEMutator::premutate( IfStmt * ifStmt ) {
                 // generate a label for breaking out of a labeled if
                 bool labeledBlock = !(ifStmt->get_labels().empty());
@@ -321 +303 @@
         }
 
-        Statement * MultiLevelExitMutator::postmutate( IfStmt * ifStmt ) {
+        Statement * MLEMutator::postmutate( IfStmt * ifStmt ) {
                 bool labeledBlock = !(ifStmt->get_labels().empty());
                 if ( labeledBlock ) {
@@ -331 +313 @@
         }
 
-        void MultiLevelExitMutator::premutate( TryStmt * tryStmt ) {
-                // generate a label for breaking out of a labeled if
-                bool labeledBlock = !(tryStmt->get_labels().empty());
-                if ( labeledBlock ) {
-                        Label brkLabel = generator->newLabel("blockBreak", tryStmt);
-                        enclosingControlStructures.push_back( Entry( tryStmt, brkLabel ) );
-                        GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
-                } // if
-        }
-
-        Statement * MultiLevelExitMutator::postmutate( TryStmt * tryStmt ) {
-                bool labeledBlock = !(tryStmt->get_labels().empty());
-                if ( labeledBlock ) {
-                        if ( ! enclosingControlStructures.back().useBreakExit().empty() ) {
-                                set_breakLabel( enclosingControlStructures.back().useBreakExit() );
-                        } // if
-                } // if
-                return tryStmt;
-        }
-
-        void MultiLevelExitMutator::premutate( FinallyStmt * ) {
-                GuardAction([this, old = std::move(enclosingControlStructures)]() {
-                        enclosingControlStructures = std::move(old);
-                });
-                enclosingControlStructures = std::list<Entry>();
-                GuardValue( inFinally );
-                inFinally = true;
-        }
-
-        void MultiLevelExitMutator::premutate( ReturnStmt *returnStmt ) {
-                if ( inFinally ) {
-                        SemanticError( returnStmt->location, "'return' may not appear in a finally clause" );
-                }
-        }
-
-        void MultiLevelExitMutator::premutate( CaseStmt *caseStmt ) {
+        void MLEMutator::premutate( CaseStmt *caseStmt ) {
                 visit_children = false;
 
@@ -405 +352 @@
         }
 
-        void MultiLevelExitMutator::premutate( SwitchStmt *switchStmt ) {
+        void MLEMutator::premutate( SwitchStmt *switchStmt ) {
                 // generate a label for breaking out of a labeled switch
                 Label brkLabel = generator->newLabel("switchBreak", switchStmt);
@@ -431 +378 @@
         }
 
-        Statement * MultiLevelExitMutator::postmutate( SwitchStmt * switchStmt ) {
+        Statement * MLEMutator::postmutate( SwitchStmt * switchStmt ) {
                 Entry &e = enclosingControlStructures.back();
                 assert ( e == switchStmt );