Changeset 5518719

Timestamp:

Jan 21, 2020, 6:14:40 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

9d6317f

Parents:

26fd986 (diff), 5cdeecd (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

Location:

src

Files:

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

src/ControlStruct/LabelFixer.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 11 22:26:02 2019
-// Update Count     : 159
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jan 21 10:32:00 2020
+// Update Count     : 160
 //
 
@@ -21 +21 @@
 #include "ControlStruct/LabelGenerator.h"  // for LabelGenerator
 #include "LabelFixer.h"
-#include "MLEMutator.h"                    // for MLEMutator
+#include "MLEMutator.h"                    // for MultiLevelExitMutator
 #include "SynTree/Declaration.h"           // for FunctionDecl
 #include "SynTree/Expression.h"            // for NameExpr, Expression, Unty...
@@ -44 +44 @@
 
         void LabelFixer::postvisit( FunctionDecl * functionDecl ) {
-                PassVisitor<MLEMutator> mlemut( resolveJumps(), generator );
-                functionDecl->acceptMutator( mlemut );
+                PassVisitor<MultiLevelExitMutator> mlem( resolveJumps(), generator );
+                functionDecl->acceptMutator( mlem );
         }
 

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Jan 16 15:33:00 2020
-// Update Count     : 221
+// Last Modified On : Tue Jan 21 10:33:00 2020
+// Update Count     : 222
 //
 
@@ -33 +33 @@
 
 namespace ControlStruct {
-        MLEMutator::~MLEMutator() {
+        MultiLevelExitMutator::~MultiLevelExitMutator() {
                 delete targetTable;
                 targetTable = 0;
         }
         namespace {
-                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 ); }
+                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 );
+                }
         } // namespace
 
@@ -50 +64 @@
         // 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 MLEMutator::fixBlock( std::list< Statement * > &kids, bool caseClause ) {
+        void MultiLevelExitMutator::fixBlock( std::list< Statement * > &kids, bool caseClause ) {
                 SemanticErrorException errors;
 
@@ -81 +95 @@
         }
 
-        void MLEMutator::premutate( CompoundStmt *cmpndStmt ) {
+        void MultiLevelExitMutator::premutate( CompoundStmt *cmpndStmt ) {
                 visit_children = false;
                 bool labeledBlock = !(cmpndStmt->labels.empty());
@@ -118 +132 @@
                         }
                 }
-                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 ) {
+                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 ) {
                 std::string originalTarget = branchStmt->originalTarget;
 
@@ -230 +246 @@
         }
 
-        Statement *MLEMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
+        Statement *MultiLevelExitMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
                 // only generate these when needed
                 if( !e.isContUsed() && !e.isBreakUsed() ) return bodyLoop;
@@ -253 +269 @@
 
         template< typename LoopClass >
-        void MLEMutator::prehandleLoopStmt( LoopClass * loopStmt ) {
+        void MultiLevelExitMutator::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
@@ -264 +280 @@
 
         template< typename LoopClass >
-        Statement * MLEMutator::posthandleLoopStmt( LoopClass * loopStmt ) {
+        Statement * MultiLevelExitMutator::posthandleLoopStmt( LoopClass * loopStmt ) {
                 assert( ! enclosingControlStructures.empty() );
                 Entry &e = enclosingControlStructures.back();
@@ -275 +291 @@
         }
 
-        void MLEMutator::premutate( WhileStmt * whileStmt ) {
+        void MultiLevelExitMutator::premutate( WhileStmt * whileStmt ) {
                 return prehandleLoopStmt( whileStmt );
         }
 
-        void MLEMutator::premutate( ForStmt * forStmt ) {
+        void MultiLevelExitMutator::premutate( ForStmt * forStmt ) {
                 return prehandleLoopStmt( forStmt );
         }
 
-        Statement * MLEMutator::postmutate( WhileStmt * whileStmt ) {
+        Statement * MultiLevelExitMutator::postmutate( WhileStmt * whileStmt ) {
                 return posthandleLoopStmt( whileStmt );
         }
 
-        Statement * MLEMutator::postmutate( ForStmt * forStmt ) {
+        Statement * MultiLevelExitMutator::postmutate( ForStmt * forStmt ) {
                 return posthandleLoopStmt( forStmt );
         }
 
-        void MLEMutator::premutate( IfStmt * ifStmt ) {
+        void MultiLevelExitMutator::premutate( IfStmt * ifStmt ) {
                 // generate a label for breaking out of a labeled if
                 bool labeledBlock = !(ifStmt->get_labels().empty());
@@ -301 +317 @@
         }
 
-        Statement * MLEMutator::postmutate( IfStmt * ifStmt ) {
+        Statement * MultiLevelExitMutator::postmutate( IfStmt * ifStmt ) {
                 bool labeledBlock = !(ifStmt->get_labels().empty());
                 if ( labeledBlock ) {
@@ -311 +327 @@
         }
 
-        void MLEMutator::premutate( TryStmt * tryStmt ) {
+        void MultiLevelExitMutator::premutate( TryStmt * tryStmt ) {
                 // generate a label for breaking out of a labeled if
                 bool labeledBlock = !(tryStmt->get_labels().empty());
@@ -321 +337 @@
         }
 
-        Statement * MLEMutator::postmutate( TryStmt * tryStmt ) {
+        Statement * MultiLevelExitMutator::postmutate( TryStmt * tryStmt ) {
                 bool labeledBlock = !(tryStmt->get_labels().empty());
                 if ( labeledBlock ) {
@@ -331 +347 @@
         }
 
-        void MLEMutator::premutate( FinallyStmt * ) {
+        void MultiLevelExitMutator::premutate( FinallyStmt * ) {
                 GuardAction([this, old = std::move(enclosingControlStructures)]() {
                         enclosingControlStructures = std::move(old);
@@ -338 +354 @@
         }
 
-        void MLEMutator::premutate( CaseStmt *caseStmt ) {
+        void MultiLevelExitMutator::premutate( CaseStmt *caseStmt ) {
                 visit_children = false;
 
@@ -377 +393 @@
         }
 
-        void MLEMutator::premutate( SwitchStmt *switchStmt ) {
+        void MultiLevelExitMutator::premutate( SwitchStmt *switchStmt ) {
                 // generate a label for breaking out of a labeled switch
                 Label brkLabel = generator->newLabel("switchBreak", switchStmt);
@@ -403 +419 @@
         }
 
-        Statement * MLEMutator::postmutate( SwitchStmt * switchStmt ) {
+        Statement * MultiLevelExitMutator::postmutate( SwitchStmt * switchStmt ) {
                 Entry &e = enclosingControlStructures.back();
                 assert ( e == switchStmt );

src/ControlStruct/MLEMutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Jan 16 12:46:00 2020
-// Update Count     : 46
+// Last Modified On : Tue Jan 21 10:33:00 2020
+// Update Count     : 47
 //
-
-// Can anyone figure out what MLE stands for?
 
 #pragma once
@@ -32 +30 @@
         class LabelGenerator;
 
-        class MLEMutator : public WithVisitorRef<MLEMutator>, public WithShortCircuiting, public WithGuards {
+        class MultiLevelExitMutator : public WithVisitorRef<MultiLevelExitMutator>,
+                        public WithShortCircuiting, public WithGuards {
           public:
                 class Entry;
-                MLEMutator( std::map<Label, Statement *> *t, LabelGenerator *gen = 0 ) : targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
-                ~MLEMutator();
+                MultiLevelExitMutator( std::map<Label, Statement *> *t, LabelGenerator *gen = 0 ) :
+                        targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
+                ~MultiLevelExitMutator();
 
                 void premutate( CompoundStmt *cmpndStmt );

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jan 10 14:20:47 2020
-// Update Count     : 70
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jan 20 16:03:00 2020
+// Update Count     : 71
 //
 
@@ -101 +101 @@
 
 
-const char * BranchStmt::brType[] = { "Goto", "Break", "Continue" };
+const char * BranchStmt::brType[] = {
+        "Goto", "Break", "Continue", "Fall Through", "Fall Through Default",
+};
 
 BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticErrorException ) :
@@ -119 +121 @@
 
 void BranchStmt::print( std::ostream & os, Indenter indent ) const {
+        assert(type < 5);
         os << "Branch (" << brType[type] << ")" << endl ;
         if ( target != "" ) os << indent+1 << "with target: " << target << endl;