Merge pull request #72347 from rjmccall/isolated-any-implies-sendable

Make `@isolated(any)` imply `@Sendable`

Author: rjmccall

lib/Sema/TypeCheckType.cpp

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

test/Distributed/distributed_actor_isolated_any.swift

@@ -16,15 +16,15 @@ func takeInheritingAsyncIsolatedAny(@_inheritActorContext fn: @escaping @isolate
 
 // CHECK-LABEL: sil hidden [distributed] [ossa] @$s4test2DAC0A20DistributedIsolationyyF
 // CHECK:         // function_ref closure #1
-// CHECK-NEXT:    [[CLOSURE_FN:%.*]] = function_ref @$s4test2DAC0A20DistributedIsolationyyFyyYacfU_ : $@convention(thin) @async (@guaranteed Optional<any Actor>, @sil_isolated @guaranteed DA) -> ()
+// CHECK-NEXT:    [[CLOSURE_FN:%.*]] = function_ref @$s4test2DAC0A20DistributedIsolationyyFyyYaYbcfU_ : $@convention(thin) @Sendable @async (@guaranteed Optional<any Actor>, @sil_isolated @guaranteed DA) -> ()
 // CHECK-NEXT:    [[CAPTURE:%.*]] = copy_value %0 : $DA
 // CHECK-NEXT:    [[CAPTURE_FOR_ISOLATION:%.*]] = copy_value [[CAPTURE]] : $DA
 //   The conformance here is special, but we don't record that in the printed SIL.
 // CHECK-NEXT:    [[ISOLATION_OBJECT:%.*]] = init_existential_ref [[CAPTURE_FOR_ISOLATION]] : $DA : $DA, $any Actor
 // CHECK-NEXT:    [[ISOLATION:%.*]] = enum $Optional<any Actor>, #Optional.some!enumelt, [[ISOLATION_OBJECT]] : $any Actor
 // CHECK-NEXT:    [[CLOSURE:%.*]] = partial_apply [callee_guaranteed] [isolated_any] [[CLOSURE_FN]]([[ISOLATION]], [[CAPTURE]])
 // CHECK-NEXT:    // function_ref
-// CHECK-NEXT:    [[TAKE_FN:%.*]] = function_ref @$s4test30takeInheritingAsyncIsolatedAny2fnyyyYaYAc_tF
+// CHECK-NEXT:    [[TAKE_FN:%.*]] = function_ref @$s4test30takeInheritingAsyncIsolatedAny2fnyyyYaYbYAc_tF
 // CHECK-NEXT:    apply [[TAKE_FN]]([[CLOSURE]])
 // CHECK-NEXT:    destroy_value [[CLOSURE]]
 distributed actor DA {

test/IRGen/isolated_any_metadata.sil

@@ -7,9 +7,9 @@ sil_stage canonical
 
 // CHECK-LABEL:        define{{.*}} swiftcc ptr @get_metadata
 // CHECK:              entry:
-// CHECK-ACCESSOR-NEXT:  [[T0:%.*]] = call swiftcc %swift.metadata_response @"$syyYAcMa"([[INT]] 0)
+// CHECK-ACCESSOR-NEXT:  [[T0:%.*]] = call swiftcc %swift.metadata_response @"$syyYbYAcMa"([[INT]] 0)
 // CHECK-ACCESSOR-NEXT:  [[METADATA:%.]] = extractvalue %swift.metadata_response [[T0]], 0
-// CHECK-DEMANGLE:       [[METADATA:%.*]] = call ptr @__swift_instantiateConcreteTypeFromMangledName(ptr @"$syyYAcMD")
+// CHECK-DEMANGLE:       [[METADATA:%.*]] = call ptr @__swift_instantiateConcreteTypeFromMangledName(ptr @"$syyYbYAcMD")
 // CHECK-NEXT:           ret ptr [[METADATA]]
 sil @get_metadata : $() -> @thick Any.Type {
 entry:
@@ -18,7 +18,7 @@ entry:
   return %result : $@thick Any.Type
 }
 
-// CHECK-ACCESSOR-LABEL: define{{.*}} swiftcc %swift.metadata_response @"$syyYAcMa"
-//   2214592512 == 0x84000000 == (ExtendedFlags | Escaping)
+// CHECK-ACCESSOR-LABEL: define{{.*}} swiftcc %swift.metadata_response @"$syyYbYAcMa"
+//   3288334336 == 0xc4000000 == (ExtendedFlags | Sendable | Escaping)
 //   2 == IsolatedAny
-// CHECK-ACCESSOR:         call ptr @swift_getExtendedFunctionTypeMetadata([[INT]] 2214592512, [[INT]] 0, ptr null, ptr null, ptr getelementptr inbounds {{.*}} @"$sytN"{{.*}}), ptr null, i32 2, ptr null)
+// CHECK-ACCESSOR:         call ptr @swift_getExtendedFunctionTypeMetadata([[INT]] 3288334336, [[INT]] 0, ptr null, ptr null, ptr getelementptr inbounds {{.*}} @"$sytN"{{.*}}), ptr null, i32 2, ptr null)

test/ModuleInterface/isolated_any_suppression.swift

@@ -3,20 +3,20 @@
 // RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -module-name isolated_any -emit-module -o %t/isolated_any.swiftmodule -emit-module-interface-path -  -enable-experimental-feature IsolatedAny %s | %FileCheck %s
 
 // CHECK:      #if compiler(>=5.3) && $IsolatedAny
-// CHECK-NEXT: {{^}}public func test1(fn: @isolated(any) () -> ())
+// CHECK-NEXT: {{^}}public func test1(fn: @isolated(any) @Sendable () -> ())
 // CHECK-NEXT: #endif
 public func test1(fn: @isolated(any) () -> ()) {}
 
 // CHECK-NEXT: #if compiler(>=5.3) && $IsolatedAny
-// CHECK-NEXT: {{^}}public func test2(fn: @isolated(any) () -> ())
+// CHECK-NEXT: {{^}}public func test2(fn: @isolated(any) @Sendable () -> ())
 // CHECK-NEXT: #endif
 @_allowFeatureSuppression(XXX)
 public func test2(fn: @isolated(any) () -> ()) {}
 
 // CHECK-NEXT: #if compiler(>=5.3) && $IsolatedAny
-// CHECK-NEXT: {{^}}public func test3(fn: @isolated(any) () -> ())
+// CHECK-NEXT: {{^}}public func test3(fn: @isolated(any) @Sendable () -> ())
 // CHECK-NEXT: #else
-// CHECK-NEXT: {{^}}public func test3(fn: () -> ())
+// CHECK-NEXT: {{^}}public func test3(fn: @Sendable () -> ())
 // CHECK-NEXT: #endif
 @_allowFeatureSuppression(IsolatedAny)
 public func test3(fn: @isolated(any) () -> ()) {}