[Sema] Only @execution(concurrent) cannot be used with other forms of isolation

Author: xedin

lib/Sema/TypeCheckType.cpp

@@ -4203,35 +4203,37 @@ NeverNullType TypeResolver::resolveASTFunctionType(
                       diag::attr_execution_type_attr_only_on_async);
     }
 
-    switch (isolation.getKind()) {
-    case FunctionTypeIsolation::Kind::NonIsolated:
-      break;
-         
-    case FunctionTypeIsolation::Kind::GlobalActor:
-      diagnoseInvalid(
-          repr, executionAttr->getAtLoc(),
-          diag::
-              attr_execution_concurrent_type_attr_incompatible_with_global_isolation,
-          isolation.getGlobalActorType());
-      break;
+    if (executionAttr->getBehavior() == ExecutionKind::Concurrent) {
+      switch (isolation.getKind()) {
+      case FunctionTypeIsolation::Kind::NonIsolated:
+        break;
 
-    case FunctionTypeIsolation::Kind::Parameter:
-      diagnoseInvalid(
-          repr, executionAttr->getAtLoc(),
-          diag::
-              attr_execution_concurrent_type_attr_incompatible_with_isolated_param);
-      break;
+      case FunctionTypeIsolation::Kind::GlobalActor:
+        diagnoseInvalid(
+            repr, executionAttr->getAtLoc(),
+            diag::
+                attr_execution_concurrent_type_attr_incompatible_with_global_isolation,
+            isolation.getGlobalActorType());
+        break;
 
-    case FunctionTypeIsolation::Kind::Erased:
-      diagnoseInvalid(
-          repr, executionAttr->getAtLoc(),
-          diag::
-              attr_execution_concurrent_type_attr_incompatible_with_isolated_any);
-      break;
+      case FunctionTypeIsolation::Kind::Parameter:
+        diagnoseInvalid(
+            repr, executionAttr->getAtLoc(),
+            diag::
+                attr_execution_concurrent_type_attr_incompatible_with_isolated_param);
+        break;
 
-    case FunctionTypeIsolation::Kind::NonIsolatedCaller:
-      llvm_unreachable("cannot happen because multiple @execution attributes "
-                       "aren't allowed.");
+      case FunctionTypeIsolation::Kind::Erased:
+        diagnoseInvalid(
+            repr, executionAttr->getAtLoc(),
+            diag::
+                attr_execution_concurrent_type_attr_incompatible_with_isolated_any);
+        break;
+
+      case FunctionTypeIsolation::Kind::NonIsolatedCaller:
+        llvm_unreachable("cannot happen because multiple @execution attributes "
+                         "aren't allowed.");
+      }
     }
 
     if (!repr->isInvalid()) {

test/attr/attr_execution.swift

@@ -53,7 +53,13 @@ struct TestAttributeCollisions {
   @MainActor @execution(concurrent) func testGlobalActor() async {}
   // expected-warning @-1 {{instance method 'testGlobalActor()' has multiple actor-isolation attributes ('MainActor' and 'execution(concurrent)')}}
 
+  @execution(caller) nonisolated func testNonIsolatedCaller() async {} // Ok
+  @MainActor @execution(caller) func testGlobalActorCaller() async {}
+  // expected-warning@-1 {{instance method 'testGlobalActorCaller()' has multiple actor-isolation attributes ('MainActor' and 'execution(caller)')}}
+  @execution(caller) func testCaller(arg: isolated MainActor) async {} // Ok
+
   @execution(concurrent) @Sendable func test(_: @Sendable () -> Void, _: sending Int) async {} // Ok
+  @execution(caller) @Sendable func testWithSendableCaller(_: @Sendable () -> Void, _: sending Int) async {} // Ok
 }
 
 @MainActor