Changes in / [cb0bcf1:9d47c1f]

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 : Wed Sep  6 12:00:00 2023
-// Update Count     : 35
+// Last Modified On : Mon Mar 28  9:42:00 2022
+// Update Count     : 34
 //
 
@@ -18 +18 @@
 #include "AST/Pass.hpp"
 #include "AST/Stmt.hpp"
+#include "Common/CodeLocationTools.hpp"
 #include "LabelGeneratorNew.hpp"
 
@@ -25 +26 @@
 
 namespace ControlStruct {
-
-namespace {
-
 class Entry {
   public:
@@ -37 +35 @@
                 bool used = false;
                 Target( const Label & label ) : label( label ) {}
-                Target() : label( CodeLocation(), "" ) {}
+                Target() : label( CodeLocation() ) {}
         };
         Target firstTarget;
@@ -526 +524 @@
         // 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: ;
                 // }
-                return new CompoundStmt( body->location, {
-                        body,
-                        labelledNullStmt( body->location, entry.useContExit() ),
-                } );
+                new_body->kids.push_back(
+                        labelledNullStmt( body->location, entry.useContExit() ) );
+                // {
+                //  body
+                //  ContinueLabel: {}
+                // }
+                return new_body;
         }
 
@@ -617 +620 @@
 }
 
-} // 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 );
-        return stmt->accept( visitor );
-}
-
+        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 );
+}
 } // namespace ControlStruct