Disallow worker receive inside on-fail-clause

ballerina-platform · Apr 4, 2024 · ba610e5 · ba610e5
1 parent 8c0be5d
commit ba610e5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/...a-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CodeAnalyzer.java b/...a-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CodeAnalyzer.java
@@ -1966,12 +1966,14 @@ private boolean isReceiveAllowedLocation(BLangFunctionBody enclInvokableBody, BL
     }
 
     private boolean isSendAllowedContext(BLangNode bLangNode) {
-        return isReceiveAllowedContext(bLangNode) || bLangNode.getKind() == NodeKind.IF;
+        return isReceiveAllowedContext(bLangNode) ||
+                bLangNode.getKind() == NodeKind.IF ||
+                bLangNode.getKind() == NodeKind.ON_FAIL;
     }
 
     private boolean isReceiveAllowedContext(BLangNode bLangNode) {
         return switch (bLangNode.getKind()) {
-            case BLOCK_FUNCTION_BODY, BLOCK, ON_FAIL, DO_STMT -> true;
+            case BLOCK_FUNCTION_BODY, BLOCK, DO_STMT -> true;
             default -> false;
         };
     }

diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/worker/WorkerFailTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/worker/WorkerFailTest.java
@@ -49,6 +49,9 @@ public void testSendReceiveAllowedSyntacticPositions() {
                 "possible deadlocks", 74, 17);
         validateError(result, index++, receiveNotAllowedError, 79, 15);
         validateError(result, index++, receiveNotAllowedError, 81, 21);
+        validateError(result, index++, receiveNotAllowedError, 93, 13);
+        validateError(result, index++, receiveNotAllowedError, 94, 16);
+        validateError(result, index++, receiveNotAllowedError, 94, 19);
         Assert.assertEquals(result.getErrorCount(), index);
     }
 

diff --git a/...allerina-unit-test/src/test/resources/test-src/workers/send-receive-allowed-positions.bal b/...allerina-unit-test/src/test/resources/test-src/workers/send-receive-allowed-positions.bal
@@ -90,7 +90,12 @@ public function testReceiveAllowedLocations(boolean b) returns error? {
             _ = <- function; // OK
         }
     } on fail {
-        _ = <- function; // OK
+        _ = <- function; // error: position not allowed
+        _ = <- w2|function; // error: position not allowed
+    }
+
+    worker w2 {
+        1 -> w1;
     }
 
     1 -> w1;