Changeset 9506c70

Timestamp:

Feb 24, 2025, 4:58:06 PM (7 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

b8b64c34

Parents:

4be0117

Message:

Stricter BranchStmt code generation that should prevent some of the warning cases removed in the concurrency test update. This also caught a bad case in the control flow handling code.

Location:

src

Files:

• CodeGen/CodeGenerator.cpp (modified) (1 diff)
• ControlStruct/MultiLevelExit.cpp (modified) (1 diff)

src/CodeGen/CodeGenerator.cpp

@@ -1105 +1105 @@
                 assertf( !options.genC, "fallthrough should not reach code generation." );
                 output << "fallthrough";
+                if ( ast::BranchStmt::FallThroughDefault == stmt->kind ) {
+                        assertf( stmt->target.empty(), "fallthough default should not have a target." );
+                        output << " default";
+                }
                 break;
         default:
                 assertf( false, "Bad BranchStmt value." );
         }
-        // Print branch target for labelled break/continue/fallthrough in debug mode.
-        if ( !options.genC && stmt->kind != ast::BranchStmt::Goto ) {
-                if ( !stmt->target.empty() ) {
-                        output << " " << stmt->target;
-                } else if ( stmt->kind == ast::BranchStmt::FallThrough ) {
-                        output << " default";
-                }
+        // Print branch target for labelled break/continue/fallthrough.
+        if ( ast::BranchStmt::Goto != stmt->kind && !stmt->target.empty() ) {
+                assertf( !options.genC, "labelled branch should not reach code generation. %s", stmt->target.name.c_str() );
+                output << " " << stmt->target;
         }
         output << ";";

src/ControlStruct/MultiLevelExit.cpp

@@ -499 +499 @@
                 }
 
+                // The end of the last case is always immediately before the first
+                // statement after the switch, so we can jump here as a break.
                 auto mutCase = mutStmt->cases.back().get_and_mutate();
-
-                Label label( mutCase->location, "breakLabel" );
-                auto branch = new BranchStmt( mutCase->location, BranchStmt::Break, label );
-                branch->labels.push_back( entry.useBreakExit() );
+                auto branch = labelledNullStmt( mutCase->location, entry.useBreakExit() );
                 mutCase->stmts.push_back( branch );