Changes in src/Concurrency/Waituntil.cpp [ded018f:ed1a7ab8]

File:

• src/Concurrency/Waituntil.cpp (modified) (4 diffs)

src/Concurrency/Waituntil.cpp ¶

@@ -884 +884 @@
                 )
             );
+        else // we reuse the when_cond bools later during unregister so init to false if initially unused
+            body->push_back(
+                new DeclStmt( cLoc,
+                    new ObjectDecl( cLoc,
+                        currClause->whenName,
+                        new BasicType( BasicType::Kind::Bool ),
+                        new SingleInit( cLoc, ConstantExpr::from_bool( cLoc, false ) )
+                    )
+                )
+            );
         
         // select_node clause1;
@@ -1296 +1306 @@
     CompoundStmt * unregisters = new CompoundStmt( loc );
 
-
-    Expr * statusExpr; // !__CFA_has_clause_run( clause_statuses[i] )
+    // Collection of optional statement executions following finally clause
+    // for each clause:
+    // if ( when_cond_i ) clausei->stmt;
+    // when_cond_i is repurposed in the finally to store if any statements need to be run after unregisters
+    // the statements need to be run outside a finally clause since they may contain non-local transfers
+    CompoundStmt * unregisterStmts = new CompoundStmt( loc );
+
+    UntypedExpr * statusExpr; // !__CFA_has_clause_run( clause_statuses[i] )
+    ExprStmt * assignStmt; // when_cond_i = (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei );
     for ( int i = 0; i < numClauses; i++ ) {
         const CodeLocation & cLoc = stmt->clauses.at(i)->location;
@@ -1315 +1332 @@
         
         // Generates:
-        // (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei );
-        statusExpr = new LogicalExpr( cLoc,
-            new CastExpr( cLoc,
-                statusExpr, 
-                new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
-            ),
-            new CastExpr( cLoc,
-                genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "unregister_select" ),
-                new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
-            ),
-            LogicalFlag::AndExpr
-        );
-        
-        // if when cond defined generates:
-        // when_cond_i && (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei );
-        if ( stmt->clauses.at(i)->when_cond )
-            statusExpr = new LogicalExpr( cLoc,
-                new CastExpr( cLoc,
-                    new NameExpr( cLoc, clauseData.at(i)->whenName ), 
-                    new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
-                ),
-                new CastExpr( cLoc,
-                    statusExpr,
-                    new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
-                ),
-                LogicalFlag::AndExpr
+        // when_cond_i = (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei );
+        assignStmt = new ExprStmt( cLoc, 
+            UntypedExpr::createAssign( cLoc,
+                new NameExpr( cLoc, clauseData.at(i)->whenName ),
+                new LogicalExpr( cLoc,
+                    new CastExpr( cLoc,
+                        statusExpr, 
+                        new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                    ),
+                    new CastExpr( cLoc,
+                        genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "unregister_select" ),
+                        new BasicType( BasicType::Kind::Bool ), GeneratedFlag::ExplicitCast 
+                    ),
+                    LogicalFlag::AndExpr
+                )
+            )
+        );
+
+        if ( stmt->clauses.at(i)->when_cond ) // if ( when_cond_i ) assignStmt
+            unregisters->push_back( 
+                new IfStmt( cLoc,
+                    new NameExpr( cLoc, clauseData.at(i)->whenName ),
+                    new CompoundStmt( cLoc, { assignStmt } )
+                )
             );
-
-        // generates:
-        // if ( statusExpr ) { ... clausei stmt ... }
-        unregisters->push_back( 
+        else
+            unregisters->push_back( assignStmt );
+
+        unregisterStmts->push_back(
             new IfStmt( cLoc,
-                statusExpr,
+                new NameExpr( cLoc, clauseData.at(i)->whenName ),
                 genStmtBlock( stmt->clauses.at(i), clauseData.at(i) )
             )
@@ -1361 +1376 @@
         )
     );
+
+    body->push_back( unregisterStmts );
+    
 
     for ( ClauseData * datum : clauseData )