Changes in / [70f97c8:1ae3ac46]

Files:

• libcfa/src/concurrency/channel.hfa (modified) (1 diff)
• src/Concurrency/Waituntil.cpp (modified) (11 diffs)
• src/main.cc (modified) (2 diffs)
• tests/concurrency/waituntil/.expect/break.txt (deleted)
• tests/concurrency/waituntil/break.cfa (deleted)

libcfa/src/concurrency/channel.hfa

@@ -340 +340 @@
     unlock( mutex_lock );
 
-    // only return true when not special OR case and status is SAT
-    return !node.park_counter ? false : *node.clause_status == __SELECT_SAT;
+    // only return true when not special OR case, not exceptional calse and status is SAT
+    return ( node.extra == 0p || !node.park_counter ) ? false : *node.clause_status == __SELECT_SAT;
 }
 

src/Concurrency/Waituntil.cpp

@@ -142 +142 @@
     UniqueName namer_target = "__clause_target_"s;
     UniqueName namer_when = "__when_cond_"s;
-    UniqueName namer_label = "__waituntil_label_"s;
 
     string idxName = "__CFA_clause_idx_";
@@ -174 +173 @@
     void addPredicates( const WaitUntilStmt * stmt, string & satName, string & runName );
     void setUpClause( const WhenClause * clause, ClauseData * data, string & pCountName, CompoundStmt * body );
-    CompoundStmt * genStatusCheckFor( const WaitUntilStmt * stmt, vector<ClauseData *> & clauseData, string & predName );
+    ForStmt * genStatusCheckFor( const WaitUntilStmt * stmt, vector<ClauseData *> & clauseData, string & predName );
     Expr * genSelectTraitCall( const WhenClause * clause, const ClauseData * data, string fnName );
     CompoundStmt * genStmtBlock( const WhenClause * clause, const ClauseData * data );
@@ -654 +653 @@
     }
 }*/
-CompoundStmt * GenerateWaitUntilCore::genStatusCheckFor( const WaitUntilStmt * stmt, vector<ClauseData *> & clauseData, string & predName ) {
+ForStmt * GenerateWaitUntilCore::genStatusCheckFor( const WaitUntilStmt * stmt, vector<ClauseData *> & clauseData, string & predName ) {
     CompoundStmt * ifBody = new CompoundStmt( stmt->location );
     const CodeLocation & loc = stmt->location;
-
-    string switchLabel = namer_label.newName();
 
     /* generates:
@@ -710 +707 @@
                                 )
                             ),
-                            new BranchStmt( cLoc, BranchStmt::Kind::Break, Label( cLoc, switchLabel ) )
+                            new BranchStmt( cLoc, BranchStmt::Kind::Break, Label( cLoc ) )
                         }
                     )
@@ -722 +719 @@
         new SwitchStmt( loc,
             new NameExpr( loc, idxName ),
-            std::move( switchCases ),
-            { Label( loc, switchLabel ) }
+            std::move( switchCases )
         )
     );
@@ -748 +744 @@
     );
 
-    string forLabel = namer_label.newName();
-
-    // we hoist init here so that this pass can happen after hoistdecls pass
-    return new CompoundStmt( loc,
+    return new ForStmt( loc,
         {
             new DeclStmt( loc,
@@ -759 +752 @@
                     new SingleInit( loc, ConstantExpr::from_int( loc, 0 ) )
                 )
-            ),
-            new ForStmt( loc,
-                {},  // inits
-                new UntypedExpr ( loc,
-                    new NameExpr( loc, "?<?" ),
-                    {
-                        new NameExpr( loc, idxName ),
-                        ConstantExpr::from_int( loc, stmt->clauses.size() )
-                    }
-                ),  // cond
-                new UntypedExpr ( loc,
-                    new NameExpr( loc, "?++" ),
-                    { new NameExpr( loc, idxName ) }
-                ),  // inc
-                new CompoundStmt( loc,
-                    {
-                        new IfStmt( loc,
-                            new UntypedExpr ( loc,
-                                new NameExpr( loc, predName ),
-                                { new NameExpr( loc, clauseData.at(0)->statusName ) }
-                            ),
-                            new BranchStmt( loc, BranchStmt::Kind::Break, Label( loc, forLabel ) )
-                        ),
-                        ifSwitch
-                    }
-                ),   // body
-                { Label( loc, forLabel ) }
-            )
-        }
+            )
+        },  // inits
+        new UntypedExpr ( loc,
+            new NameExpr( loc, "?<?" ),
+            {
+                new NameExpr( loc, idxName ),
+                ConstantExpr::from_int( loc, stmt->clauses.size() )
+            }
+        ),  // cond
+        new UntypedExpr ( loc,
+            new NameExpr( loc, "?++" ),
+            { new NameExpr( loc, idxName ) }
+        ),  // inc
+        new CompoundStmt( loc,
+            {
+                new IfStmt( loc,
+                    new UntypedExpr ( loc,
+                        new NameExpr( loc, predName ),
+                        { new NameExpr( loc, clauseData.at(0)->statusName ) }
+                    ),
+                    new BranchStmt( loc, BranchStmt::Kind::Break, Label( loc ) )
+                ),
+                ifSwitch
+            }
+        )   // body
     );
 }
@@ -881 +870 @@
                         new BasicType( BasicType::Kind::Bool ),
                         new SingleInit( cLoc, ast::deepCopy( stmt->clauses.at(i)->when_cond ) )
-                    )
-                )
-            );
-        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 ) )
                     )
                 )
@@ -1298 +1277 @@
     }
 
-    // Collection of unregister calls on resources to be put in finally clause
-    // for each clause: 
-    // when_cond_i = (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei );
-    // OR if when( ... ) defined on resource
-    // if ( when_cond_i ) 
-    //   when_cond_i =  (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei );
     CompoundStmt * unregisters = new CompoundStmt( loc );
-
-    // 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 );
+    // generates for each clause: 
+    // if ( !has_run( clause_statuses[i] ) ) 
+    // OR if when_cond defined
+    // if ( when_cond_i && !has_run( clause_statuses[i] ) )
+    // body of if is:
+    // { if (unregister_select(A, clause1) && on_selected(A, clause1)) clause1->stmt; } // this conditionally runs the block unregister_select returns true (needed by some primitives)
+    Expr * ifCond;
+    UntypedExpr * statusExpr; // !clause_statuses[i]
     for ( int i = 0; i < numClauses; i++ ) {
         const CodeLocation & cLoc = stmt->clauses.at(i)->location;
 
-        // Generates: !__CFA_has_clause_run( clause_statuses[i] )
         statusExpr = new UntypedExpr ( cLoc,
             new NameExpr( cLoc, "!?" ),
@@ -1330 +1300 @@
             }
         );
+
+        if ( stmt->clauses.at(i)->when_cond ) {
+            // generates: if( when_cond_i && !has_run(clause_statuses[i]) )
+            ifCond = 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
+            );
+        } else // generates: if( !clause_statuses[i] )
+            ifCond = statusExpr;
         
-        // Generates:
-        // 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
+        unregisters->push_back( 
+            new IfStmt( cLoc,
+                ifCond,
+                new CompoundStmt( cLoc,
+                    {
+                        new IfStmt( cLoc,
+                            genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "unregister_select" ),
+                            // ast::deepCopy( stmt->clauses.at(i)->stmt )
+                            genStmtBlock( stmt->clauses.at(i), clauseData.at(i) )
+                        )
+                    }
                 )
-            )
-        );
-
-        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 } )
-                )
-            );
-        else
-            unregisters->push_back( assignStmt );
-
-        unregisterStmts->push_back(
-            new IfStmt( cLoc,
-                new NameExpr( cLoc, clauseData.at(i)->whenName ),
-                genStmtBlock( stmt->clauses.at(i), clauseData.at(i) )
+                
             )
         );
@@ -1376 +1342 @@
         )
     );
-
-    body->push_back( unregisterStmts );
-    
 
     for ( ClauseData * datum : clauseData )

src/main.cc

@@ -343 +343 @@
                 PASS( "Implement Concurrent Keywords", Concurrency::implementKeywords, transUnit );
                 PASS( "Forall Pointer Decay", Validate::decayForallPointers, transUnit );
+        PASS( "Implement Waituntil", Concurrency::generateWaitUntil, transUnit  );
                 PASS( "Hoist Control Declarations", ControlStruct::hoistControlDecls, transUnit );
 
@@ -369 +370 @@
                 PASS( "Translate Throws", ControlStruct::translateThrows, transUnit );
                 PASS( "Fix Labels", ControlStruct::fixLabels, transUnit );
-        PASS( "Implement Waituntil", Concurrency::generateWaitUntil, transUnit  );
                 PASS( "Fix Names", CodeGen::fixNames, transUnit );
                 PASS( "Gen Init", InitTweak::genInit, transUnit );