Changeset cb0bcf1

Timestamp:

Sep 6, 2023, 3:44:10 PM (15 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

01510fe

Parents:

9d47c1f (diff), 4a40fca7 (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/MultiLevelExit.cpp (modified) (6 diffs)

src/ControlStruct/MultiLevelExit.cpp

@@ -10 +10 @@
 // Created On       : Mon Nov  1 13:48:00 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Mar 28  9:42:00 2022
-// Update Count     : 34
+// Last Modified On : Wed Sep  6 12:00:00 2023
+// Update Count     : 35
 //
 
@@ -18 +18 @@
 #include "AST/Pass.hpp"
 #include "AST/Stmt.hpp"
-#include "Common/CodeLocationTools.hpp"
 #include "LabelGeneratorNew.hpp"
 
@@ -26 +25 @@
 
 namespace ControlStruct {
+
+namespace {
+
 class Entry {
   public:
@@ -35 +37 @@
                 bool used = false;
                 Target( const Label & label ) : label( label ) {}
-                Target() : label( CodeLocation() ) {}
+                Target() : label( CodeLocation(), "" ) {}
         };
         Target firstTarget;
@@ -524 +526 @@
         // 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
+                //  ContinueLabel: ;
                 // }
-                new_body->kids.push_back(
-                        labelledNullStmt( body->location, entry.useContExit() ) );
-                // {
-                //  body
-                //  ContinueLabel: {}
-                // }
-                return new_body;
+                return new CompoundStmt( body->location, {
+                        body,
+                        labelledNullStmt( body->location, entry.useContExit() ),
+                } );
         }
 
@@ -620 +617 @@
 }
 
+} // namespace
+
 const CompoundStmt * multiLevelExitUpdate(
-        const CompoundStmt * stmt,
-        const LabelToStmt & labelTable ) {
+                const CompoundStmt * stmt, const LabelToStmt & labelTable ) {
         // Must start in the body, so FunctionDecls can be a stopping point.
         Pass<MultiLevelExitCore> visitor( labelTable );
-        const CompoundStmt * ret = stmt->accept( visitor );
-        // There are some unset code locations slipping in, possibly by Labels.
-        const Node * node = localFillCodeLocations( ret->location, ret );
-        return strict_dynamic_cast<const CompoundStmt *>( node );
-}
+        return stmt->accept( visitor );
+}
+
 } // namespace ControlStruct