Changeset 17cb385 for src/ControlStruct

Timestamp:

Feb 2, 2022, 7:51:30 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

941e14a

Parents:

fc72696c (diff), 4e7171f (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/ControlStruct

Files:

• ForExprMutator.cc (modified) (2 diffs)
• ForExprMutator.h (modified) (3 diffs)
• HoistControlDecls.cpp (modified) (3 diffs)
• LabelFixer.cc (modified) (2 diffs)
• LabelGeneratorNew.cpp (modified) (2 diffs)
• MLEMutator.cc (modified) (4 diffs)
• MLEMutator.h (modified) (3 diffs)
• MultiLevelExit.cpp (modified) (12 diffs)

src/ControlStruct/ForExprMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 11 22:26:52 2019
-// Update Count     : 14
+// Last Modified On : Tue Feb  1 09:26:12 2022
+// Update Count     : 16
 //
 
@@ -45 +45 @@
                 return hoist( forStmt, forStmt->initialization );
         }
-        Statement * ForExprMutator::postmutate( WhileStmt * whileStmt ) {
-                return hoist( whileStmt, whileStmt->initialization );
+        Statement * ForExprMutator::postmutate( WhileDoStmt * whileDoStmt ) {
+                return hoist( whileDoStmt, whileDoStmt->initialization );
         }
 } // namespace ControlStruct

src/ControlStruct/ForExprMutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan 30 09:14:46 2022
-// Update Count     : 6
+// Last Modified On : Tue Feb  1 09:18:50 2022
+// Update Count     : 7
 //
 
@@ -18 +18 @@
 class IfStmt;
 class ForStmt;
-class WhileStmt;
+class WhileDoStmt;
 class Statement;
 
@@ -26 +26 @@
                 Statement * postmutate( IfStmt * );
                 Statement * postmutate( ForStmt * );
-                Statement * postmutate( WhileStmt * );
+                Statement * postmutate( WhileDoStmt * );
         };
 } // namespace ControlStruct

src/ControlStruct/HoistControlDecls.cpp

@@ -10 +10 @@
 // Created On       : Fri Dec  3 15:34:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 31 18:52:35 2022
-// Update Count     : 23
+// Last Modified On : Tue Feb  1 18:59:47 2022
+// Update Count     : 25
 //
 
@@ -35 +35 @@
 
         CompoundStmt * block = new CompoundStmt( stmt->location ); // create empty compound statement
-        //    {
-        //    }
+        //    {}
 
         for ( const Stmt * next : stmt->inits ) {                       // link conditional declarations into compound
@@ -69 +68 @@
                 return hoist<ForStmt>( stmt );
         }
-        const Stmt * postvisit( const WhileStmt * stmt ) {
-                return hoist<WhileStmt>( stmt );
+        const Stmt * postvisit( const WhileDoStmt * stmt ) {
+                return hoist<WhileDoStmt>( stmt );
         }
 };

src/ControlStruct/LabelFixer.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 31 22:28:31 2022
-// Update Count     : 161
+// Last Modified On : Tue Feb  1 09:12:09 2022
+// Update Count     : 162
 //
 
@@ -29 +29 @@
 bool LabelFixer::Entry::insideLoop() {
         return ( dynamic_cast< ForStmt * > ( definition ) ||
-                dynamic_cast< WhileStmt * > ( definition )  );
+                dynamic_cast< WhileDoStmt * > ( definition )  );
 }
 

src/ControlStruct/LabelGeneratorNew.cpp

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 31 18:51:10 2022
-// Update Count     : 71
+// Last Modified On : Wed Feb  2 09:11:17 2022
+// Update Count     : 72
 //
 
@@ -28 +28 @@
         static int current = 0;
 
-        assert( ( (void)"CFA internal error: parameter statement cannot be null pointer", stmt ) );
+        assertf( stmt, "CFA internal error: parameter statement cannot be null pointer" );
 
         enum { size = 128 };
         char buf[size];                                                                         // space to build label
         int len = snprintf( buf, size, "__L%d__%s", current++, suffix.c_str() );
-        assert( ( (void)"CFA Internal error: buffer overflow creating label", len < size ) );
+        assertf( len < size, "CFA Internal error: buffer overflow creating label" );
 
         // What does this do?
         if ( ! stmt->labels.empty() ) {
                 len = snprintf( buf + len, size - len, "_%s__", stmt->labels.front().name.c_str() );
-                assert( ( (void)"CFA Internal error: buffer overflow creating label", len < size - len ) );
+                assertf( len < size - len, "CFA Internal error: buffer overflow creating label" );
         } // if
 

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 : Tue Feb  1 09:26:28 2022
+// Update Count     : 225
 //
 
@@ -39 +39 @@
         namespace {
                 bool isLoop( const MultiLevelExitMutator::Entry & e ) {
-                        return dynamic_cast< WhileStmt * >( e.get_controlStructure() )
+                        return dynamic_cast< WhileDoStmt * >( e.get_controlStructure() )
                                 || dynamic_cast< ForStmt * >( e.get_controlStructure() );
                 }
@@ -295 +295 @@
         }
 
-        void MultiLevelExitMutator::premutate( WhileStmt * whileStmt ) {
-                return prehandleLoopStmt( whileStmt );
+        void MultiLevelExitMutator::premutate( WhileDoStmt * whileDoStmt ) {
+                return prehandleLoopStmt( whileDoStmt );
         }
 
@@ -303 +303 @@
         }
 
-        Statement * MultiLevelExitMutator::postmutate( WhileStmt * whileStmt ) {
-                return posthandleLoopStmt( whileStmt );
+        Statement * MultiLevelExitMutator::postmutate( WhileDoStmt * whileDoStmt ) {
+                return posthandleLoopStmt( whileDoStmt );
         }
 

src/ControlStruct/MLEMutator.h

@@ -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     : 48
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Feb  1 09:27:24 2022
+// Update Count     : 50
 //
 
@@ -42 +42 @@
                 void premutate( CompoundStmt *cmpndStmt );
                 Statement * postmutate( BranchStmt *branchStmt ) throw ( SemanticErrorException );
-                void premutate( WhileStmt *whileStmt );
-                Statement * postmutate( WhileStmt *whileStmt );
+                void premutate( WhileDoStmt *whileDoStmt );
+                Statement * postmutate( WhileDoStmt *whileDoStmt );
                 void premutate( ForStmt *forStmt );
                 Statement * postmutate( ForStmt *forStmt );
@@ -67 +67 @@
                                 stmt( stmt ), breakExit( breakExit ), contExit( contExit ) {}
 
-                        explicit Entry( WhileStmt *stmt, Label breakExit, Label contExit ) :
+                        explicit Entry( WhileDoStmt *stmt, Label breakExit, Label contExit ) :
                                 stmt( stmt ), breakExit( breakExit ), contExit( contExit ) {}
 

src/ControlStruct/MultiLevelExit.cpp

@@ -10 +10 @@
 // Created On       : Mon Nov  1 13:48:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 31 22:35:08 2022
-// Update Count     : 28
+// Last Modified On : Tue Feb  1 18:48:47 2022
+// Update Count     : 29
 //
 
@@ -40 +40 @@
 
         enum Kind {
-                ForStmtK, WhileStmtK, CompoundStmtK, IfStmtK, CaseStmtK, SwitchStmtK, TryStmtK
+                ForStmtK, WhileDoStmtK, CompoundStmtK, IfStmtK, CaseStmtK, SwitchStmtK, TryStmtK
         } kind;
 
@@ -53 +53 @@
         Entry( const ForStmt * stmt, Label breakExit, Label contExit ) :
                 stmt( stmt ), firstTarget( breakExit ), secondTarget( contExit ), kind( ForStmtK ) {}
-        Entry( const WhileStmt * stmt, Label breakExit, Label contExit ) :
-                stmt( stmt ), firstTarget( breakExit ), secondTarget( contExit ), kind( WhileStmtK ) {}
+        Entry( const WhileDoStmt * stmt, Label breakExit, Label contExit ) :
+                stmt( stmt ), firstTarget( breakExit ), secondTarget( contExit ), kind( WhileDoStmtK ) {}
         Entry( const CompoundStmt *stmt, Label breakExit ) :
                 stmt( stmt ), firstTarget( breakExit ), secondTarget(), kind( CompoundStmtK ) {}
@@ -66 +66 @@
                 stmt( stmt ), firstTarget( breakExit ), secondTarget(), kind( TryStmtK ) {}
 
-        bool isContTarget() const { return kind <= WhileStmtK; }
+        bool isContTarget() const { return kind <= WhileDoStmtK; }
         bool isBreakTarget() const { return kind != CaseStmtK; }
         bool isFallTarget() const { return kind == CaseStmtK; }
         bool isFallDefaultTarget() const { return kind == SwitchStmtK; }
 
-        Label useContExit() { assert( kind <= WhileStmtK ); return useTarget(secondTarget); }
+        // These routines set a target as being "used" by a BranchStmt
+        Label useContExit() { assert( kind <= WhileDoStmtK ); return useTarget(secondTarget); }
         Label useBreakExit() { assert( kind != CaseStmtK ); return useTarget(firstTarget); }
         Label useFallExit() { assert( kind == CaseStmtK );  return useTarget(firstTarget); }
         Label useFallDefaultExit() { assert( kind == SwitchStmtK ); return useTarget(secondTarget); }
 
-        bool isContUsed() const { assert( kind <= WhileStmtK ); return secondTarget.used; }
+        // These routines check if a specific label for a statement is used by a BranchStmt
+        bool isContUsed() const { assert( kind <= WhileDoStmtK ); return secondTarget.used; }
         bool isBreakUsed() const { assert( kind != CaseStmtK ); return firstTarget.used; }
         bool isFallUsed() const { assert( kind == CaseStmtK ); return firstTarget.used; }
@@ -110 +112 @@
         const CompoundStmt * previsit( const CompoundStmt * );
         const BranchStmt * postvisit( const BranchStmt * );
-        void previsit( const WhileStmt * );
-        const WhileStmt * postvisit( const WhileStmt * );
+        void previsit( const WhileDoStmt * );
+        const WhileDoStmt * postvisit( const WhileDoStmt * );
         void previsit( const ForStmt * );
         const ForStmt * postvisit( const ForStmt * );
@@ -164 +166 @@
         const CompoundStmt * stmt ) {
         visit_children = false;
+
+        // if the stmt is labelled then generate a label to check in postvisit if the label is used
         bool isLabeled = !stmt->labels.empty();
         if ( isLabeled ) {
@@ -217 +221 @@
 }
 
+// This routine updates targets on enclosing control structures to indicate which
+//     label is used by the BranchStmt that is passed
 const BranchStmt * MultiLevelExitCore::postvisit( const BranchStmt * stmt ) {
         vector<Entry>::reverse_iterator targetEntry =
                 enclosing_control_structures.rend();
+
+        // Labels on different stmts require different approaches to access
         switch ( stmt->kind ) {
           case BranchStmt::Goto:
@@ -253 +261 @@
                   break;
           }
+          // handle fallthrough in case/switch stmts
           case BranchStmt::FallThrough: {
                   targetEntry = findEnclosingControlStructure( isFallthroughTarget );
@@ -333 +342 @@
 }
 
-void MultiLevelExitCore::previsit( const WhileStmt * stmt ) {
+void MultiLevelExitCore::previsit( const WhileDoStmt * stmt ) {
         return prehandleLoopStmt( stmt );
 }
 
-const WhileStmt * MultiLevelExitCore::postvisit( const WhileStmt * stmt ) {
+const WhileDoStmt * MultiLevelExitCore::postvisit( const WhileDoStmt * stmt ) {
         return posthandleLoopStmt( stmt );
 }
@@ -530 +539 @@
         }
 
+        // if continue is used insert a continue label into the back of the body of the loop
         if ( entry.isContUsed() ) {
                 CompoundStmt * new_body = new CompoundStmt( body->location );
+                // {}
                 new_body->kids.push_back( body );
+                // {
+                //  body
+                // }
                 new_body->kids.push_back(
                         labelledNullStmt( body->location, entry.useContExit() ) );
+                // {
+                //  body
+                //  ContinueLabel: {}
+                // }
                 return new_body;
         }
@@ -548 +566 @@
         Label contLabel = newLabel( "loopContinue", loopStmt );
         enclosing_control_structures.emplace_back( loopStmt, breakLabel, contLabel );
+        // labels are added temporarily to see if they are used and then added permanently in postvisit if ther are used
+        // children will tag labels as being used during their traversal which occurs before postvisit
+
+        // GuardAction calls the lambda after the node is done being visited
         GuardAction( [this](){ enclosing_control_structures.pop_back(); } );
 }
@@ -560 +582 @@
         return mutate_field(
                 loopStmt, &LoopNode::body, mutateLoop( loopStmt->body, entry ) );
+        // this call to mutate_field compares loopStmt->body and the result of mutateLoop
+        //              if they are the same the node isn't mutated, if they differ then the new mutated node is returned
+        //              the stmts will only differ if a label is used
 }