[Concurrency] @isolated(any) does not imply @Sendable.

lib/Sema/TypeCheckType.cpp

@@ -3941,9 +3941,6 @@ NeverNullType TypeResolver::resolveASTFunctionType(
                           conventionAttr->getConventionName());
         } else {
           isolation = FunctionTypeIsolation::forErased();
-
-          // @isolated(any) implies @Sendable, unconditionally for now.
-          sendable = true;
         }
         break;
       }

test/Concurrency/isolated_any.swift

@@ -75,7 +75,7 @@ func testConvertIsolatedAnyToMainActor(fn: @Sendable @isolated(any) () -> ()) {
   requireSendableGlobalActor(fn)
 }
 
-func extractFunctionIsolation(_ fn: @isolated(any) @escaping () async -> Void) {
+func extractFunctionIsolation(_ fn: @isolated(any) @Sendable @escaping () async -> Void) {
   let _: (any Actor)? = extractIsolation(fn)
 
   let myActor = A()
@@ -85,8 +85,8 @@ func extractFunctionIsolation(_ fn: @isolated(any) @escaping () async -> Void) {
 }
 
 func extractFunctionIsolationExpr(
-  _ fn1: @isolated(any) @escaping () async -> Void,
-  _ fn2: @isolated(any) @escaping (Int, String) -> Bool
+  _ fn1: @isolated(any) @Sendable @escaping () async -> Void,
+  _ fn2: @isolated(any) @Sendable @escaping (Int, String) -> Bool
 ) {
   let _: (any Actor)? = fn1.isolation
   let _: (any Actor)? = fn2.isolation
@@ -118,9 +118,15 @@ func testFunctionIsolationExpr2(_ fn: Optional<(@isolated(any) () -> Void)>) ->
 }
 
 func testFunctionIsolationExprTuple(
-  _ fn1: (@isolated(any) () -> Void)?,
-  _ fn2: (@isolated(any) () -> Void)?
+  _ fn1: (@isolated(any) @Sendable () -> Void)?,
+  _ fn2: (@isolated(any) @Sendable () -> Void)?
 ) -> ((any Actor)?, (any Actor)?)
 {
   return (fn1?.isolation, fn2?.isolation)
 }
+
+func nonSendableIsolatedAny(
+  _ fn: @escaping @isolated(any) () -> Void // expected-note {{parameter 'fn' is implicitly non-sendable}}
+) {
+  let _: @Sendable () -> Void = fn  // expected-warning {{using non-sendable parameter 'fn' in a context expecting a @Sendable closure}}
+}

test/Distributed/distributed_actor_isolated_any.swift

@@ -12,7 +12,7 @@ import FakeDistributedActorSystems
 
 typealias DefaultDistributedActorSystem = FakeActorSystem
 
-func takeInheritingAsyncIsolatedAny(@_inheritActorContext fn: @escaping @isolated(any) () async -> ()) {}
+func takeInheritingAsyncIsolatedAny(@_inheritActorContext fn: @escaping @isolated(any) @Sendable () async -> ()) {}
 
 // CHECK-LABEL: sil hidden [distributed] [ossa] @$s4test2DAC0A20DistributedIsolationyyF
 // CHECK:         // function_ref closure #1

test/IRGen/isolated_any_metadata.sil

@@ -13,8 +13,8 @@ sil_stage canonical
 // CHECK-NEXT:           ret ptr [[METADATA]]
 sil @get_metadata : $() -> @thick Any.Type {
 entry:
-  %type = metatype $@thick (@isolated(any) () -> ()).Type
-  %result = init_existential_metatype %type : $@thick (@isolated(any) () -> ()).Type, $@thick Any.Type
+  %type = metatype $@thick (@isolated(any) @Sendable () -> ()).Type
+  %result = init_existential_metatype %type : $@thick (@isolated(any) @Sendable () -> ()).Type, $@thick Any.Type
   return %result : $@thick Any.Type
 }
 

test/ModuleInterface/isolated_any_suppression.swift

@@ -6,18 +6,18 @@
 // CHECK:      #if compiler(>=5.3) && $IsolatedAny
 // CHECK-NEXT: {{^}}public func test1(fn: @isolated(any) @Sendable () -> ())
 // CHECK-NEXT: #endif
-public func test1(fn: @isolated(any) () -> ()) {}
+public func test1(fn: @isolated(any) @Sendable () -> ()) {}
 
 // CHECK-NEXT: #if compiler(>=5.3) && $IsolatedAny
 // CHECK-NEXT: {{^}}public func test2(fn: @isolated(any) @Sendable () -> ())
 // CHECK-NEXT: #endif
 @_allowFeatureSuppression(XXX)
-public func test2(fn: @isolated(any) () -> ()) {}
+public func test2(fn: @isolated(any) @Sendable () -> ()) {}
 
 // CHECK-NEXT: #if compiler(>=5.3) && $IsolatedAny
 // CHECK-NEXT: {{^}}public func test3(fn: @isolated(any) @Sendable () -> ())
 // CHECK-NEXT: #else
 // CHECK-NEXT: {{^}}public func test3(fn: @Sendable () -> ())
 // CHECK-NEXT: #endif
 @_allowFeatureSuppression(IsolatedAny)
-public func test3(fn: @isolated(any) () -> ()) {}
+public func test3(fn: @isolated(any) @Sendable () -> ()) {}

test/SILGen/isolated_any.swift

@@ -14,7 +14,7 @@
 // CHECK-NEXT:    end_borrow [[FN_BORROW2]]
 // CHECK-NEXT:    end_borrow [[FN_BORROW1]]
 // CHECK-NEXT:    hop_to_executor [[NIL_EXECUTOR]]
-func callSync(fn: @isolated(any) () -> ()) async {
+func callSync(fn: @isolated(any) @Sendable () -> ()) async {
   await fn()
 }
 
@@ -26,7 +26,7 @@ func callSync(fn: @isolated(any) () -> ()) async {
 // CHECK-NEXT:    apply [[FN_BORROW2]]()
 // CHECK-NEXT:    end_borrow [[FN_BORROW2]]
 // CHECK-NEXT:    hop_to_executor [[NIL_EXECUTOR]]
-func callAsync(fn: @isolated(any) () async -> ()) async {
+func callAsync(fn: @isolated(any) @Sendable () async -> ()) async {
   await fn()
 }
 
@@ -40,7 +40,7 @@ func callAsync(fn: @isolated(any) () async -> ()) async {
 // CHECK-NEXT:    [[THUNKED_FN:%.*]] = partial_apply [callee_guaranteed] [isolated_any] [[THUNK]]([[ISOLATION]], [[FN_COPY]])
 // CHECK-NEXT:    return [[THUNKED_FN]] : $@isolated(any) @Sendable @async @callee_guaranteed () -> ()
 func convertFromNonIsolated(fn: @escaping @Sendable () async -> ())
-    -> @isolated(any) () async -> () {
+    -> @isolated(any) @Sendable () async -> () {
   return fn
 }
 
@@ -71,7 +71,7 @@ func convertFromNonIsolated(fn: @escaping @Sendable () async -> ())
 // CHECK-NEXT:    [[THUNKED_FN:%.*]] = partial_apply [callee_guaranteed] [isolated_any] [[THUNK]]([[ISOLATION]], [[FN_COPY]])
 // CHECK-NEXT:    return [[THUNKED_FN]] : $@isolated(any) @Sendable @async @callee_guaranteed () -> ()
 func convertFromMainActor(fn: @escaping @Sendable @MainActor () async -> ())
-    -> @isolated(any) () async -> () {
+    -> @isolated(any) @Sendable () async -> () {
   return fn
 }
 
@@ -90,7 +90,7 @@ func convertFromMainActor(fn: @escaping @Sendable @MainActor () async -> ())
 // CHECK-NEXT:    [[THUNKED_FN:%.*]] = partial_apply [callee_guaranteed] [isolated_any] [[THUNK]]([[ISOLATION]], [[FN_COPY]])
 // CHECK-NEXT:    return [[THUNKED_FN]] : $@isolated(any) @Sendable @async @callee_guaranteed () -> Optional<Int>
 func convertFromMainActorWithOtherChanges(fn: @escaping @Sendable @MainActor () async -> Int)
-    -> @isolated(any) () async -> Int? {
+    -> @isolated(any) @Sendable () async -> Int? {
   return fn
 }
 
@@ -107,7 +107,7 @@ func convertFromMainActorWithOtherChanges(fn: @escaping @Sendable @MainActor ()
 // CHECK-NEXT:    [[FN_COPY:%.*]] = copy_value %0 :
 // CHECK-NEXT:    [[FN_CONVERTED:%.*]] = convert_function [[FN_COPY]] : $@isolated(any) @Sendable @async @callee_guaranteed () -> () to $@Sendable @async @callee_guaranteed () -> ()
 // CHECK-NEXT:    return [[FN_CONVERTED]] :
-func convertToNonIsolated(fn: @escaping @isolated(any) () async -> ())
+func convertToNonIsolated(fn: @escaping @isolated(any) @Sendable () async -> ())
     -> @Sendable () async -> () {
   return fn
 }
@@ -129,16 +129,16 @@ func convertToNonIsolated(fn: @escaping @isolated(any) () async -> ())
 // CHECK-NEXT:    [[SOME_INT:%.*]] = enum $Optional<Int>, #Optional.some!enumelt, [[INT]] : $Int
 // CHECK-NEXT:    return [[SOME_INT]] : $Optional<Int>
 
-func convertToNonIsolatedWithOtherChanges(fn: @escaping @isolated(any) () async -> Int) -> @Sendable () async -> Int? {
+func convertToNonIsolatedWithOtherChanges(fn: @escaping @isolated(any) @Sendable () async -> Int) -> @Sendable () async -> Int? {
   return fn
 }
 
 /*-- Sync closures --*/
 
 func syncAction() {}
 
-func takeSyncIsolatedAny(fn: @escaping @isolated(any) () -> ()) {}
-func takeInheritingSyncIsolatedAny(@_inheritActorContext fn: @escaping @isolated(any) () -> ()) {}
+func takeSyncIsolatedAny(fn: @escaping @isolated(any) @Sendable () -> ()) {}
+func takeInheritingSyncIsolatedAny(@_inheritActorContext fn: @escaping @isolated(any) @Sendable () -> ()) {}
 
 // CHECK-LABEL: sil hidden [ossa] @$s4test0A27EraseSyncNonIsolatedClosureyyF
 // CHECK:         // function_ref closure #1
@@ -246,8 +246,8 @@ actor MyActor {
 
 func asyncAction() async {}
 
-func takeAsyncIsolatedAny(fn: @escaping @isolated(any) () async -> ()) {}
-func takeInheritingAsyncIsolatedAny(@_inheritActorContext fn: @escaping @isolated(any) () async -> ()) {}
+func takeAsyncIsolatedAny(fn: @escaping @isolated(any) @Sendable () async -> ()) {}
+func takeInheritingAsyncIsolatedAny(@_inheritActorContext fn: @escaping @isolated(any) @Sendable () async -> ()) {}
 
 // CHECK-LABEL: sil hidden [ossa] @$s4test0A28EraseAsyncNonIsolatedClosureyyF
 // CHECK:         // function_ref closure #1
@@ -383,7 +383,7 @@ extension MyActor {
   func asyncAction() async {}
 }
 
-func takeInheritingOptionalAsyncIsolatedAny(@_inheritActorContext fn: Optional<@isolated(any) () async -> ()>) {}
+func takeInheritingOptionalAsyncIsolatedAny(@_inheritActorContext fn: Optional<@isolated(any) @Sendable () async -> ()>) {}
 
 // CHECK-LABEL: sil hidden [ossa] @$s4test7MyActorC0a20EraseInheritingAsyncC19ClosureIntoOptionalyyF
 // CHECK:         // function_ref closure #1
@@ -406,7 +406,7 @@ extension MyActor {
   }
 }
 
-func takeInheritingAsyncIsolatedAny_optionalResult(@_inheritActorContext fn: @escaping @isolated(any) () async -> Int?) {}
+func takeInheritingAsyncIsolatedAny_optionalResult(@_inheritActorContext fn: @escaping @isolated(any) @Sendable () async -> Int?) {}
 
 // Test that we correctly handle isolation erasure from closures even when
 // we can't completely apply the conversion as a peephole.
@@ -526,6 +526,6 @@ func testEraseAsyncActorIsolatedPartialApplication(a: MyActor) {
 // CHECK-NEXT: end_borrow [[FN_BORROW]] : $@isolated(any) @Sendable @callee_guaranteed () -> ()
 // CHECK-NEXT: destroy_value [[FN]] : $@isolated(any) @Sendable @callee_guaranteed () -> ()
 // CHECK-NEXT: return [[RESULT]] : $Optional<any Actor>
-func extractIsolation(fn: @escaping @isolated(any) () -> Void) -> (any Actor)? {
+func extractIsolation(fn: @escaping @isolated(any) @Sendable () -> Void) -> (any Actor)? {
   fn.isolation
 }

test/SILGen/isolated_any_conformance.swift

@@ -7,7 +7,7 @@
 // introduced a protocol for different task group types.
 
 struct A<T> {
-  func enqueue(operation: @escaping @isolated(any) () async -> T) {}
+  func enqueue(operation: @escaping @isolated(any) @Sendable () async -> T) {}
 }
 
 protocol Enqueuer {

test/decl/protocol/conforms/isolated_any.swift

@@ -9,7 +9,7 @@ protocol AnnotatedEnqueuer {
   associatedtype Result
 
   // expected-note @+1 {{protocol requires function}}
-  func enqueue(operation: @escaping @isolated(any) () async -> Result)
+  func enqueue(operation: @escaping @isolated(any) @Sendable () async -> Result)
 }
 
 // expected-error @+1 {{type 'A<T>' does not conform to protocol 'AnnotatedEnqueuer'}}