[Concurrency] #isolation+nonsending nonisolated - review followup and SIL test

Author: ktoso

lib/SILGen/SILGenExpr.cpp

@@ -7299,6 +7299,18 @@ RValue RValueEmitter::visitCurrentContextIsolationExpr(
     dyn_cast_or_null<AbstractFunctionDecl>(SGF.F.getDeclRef().getDecl());
   if (afd) {
     auto isolation = getActorIsolation(afd);
+    auto ctor = dyn_cast_or_null<ConstructorDecl>(afd);
+    if (ctor && ctor->isDesignatedInit() &&
+        isolation == ActorIsolation::ActorInstance &&
+        isolation.getActorInstance() == ctor->getImplicitSelfDecl()) {
+      // If we are in an actor initializer that is isolated to self, the
+      // current isolation is flow-sensitive; use that instead of the
+      // synthesized expression.
+      auto isolationValue =
+        SGF.emitFlowSensitiveSelfIsolation(E, isolation);
+      return RValue(SGF, E, isolationValue);
+    }
+
     if (isolation == ActorIsolation::CallerIsolationInheriting) {
       auto *isolatedArg = SGF.F.maybeGetIsolatedArgument();
       assert(isolatedArg &&
@@ -7311,18 +7323,6 @@ RValue RValueEmitter::visitCurrentContextIsolationExpr(
       }
       return RValue(SGF, E, isolatedMV);
     }
-
-    auto ctor = dyn_cast_or_null<ConstructorDecl>(afd);
-    if (ctor && ctor->isDesignatedInit() &&
-        isolation == ActorIsolation::ActorInstance &&
-        isolation.getActorInstance() == ctor->getImplicitSelfDecl()) {
-      // If we are in an actor initializer that is isolated to self, the
-      // current isolation is flow-sensitive; use that instead of the
-      // synthesized expression.
-      auto isolationValue =
-        SGF.emitFlowSensitiveSelfIsolation(E, isolation);
-      return RValue(SGF, E, isolationValue);
-    }
   }
 
   return visit(E->getActor(), C);

test/Concurrency/isolated_nonsending_isolation_macro_sil.swift

@@ -0,0 +1,25 @@
+// RUN: %target-swift-frontend -parse-as-library -emit-sil %s | %FileCheck %s
+
+// REQUIRES: concurrency
+
+nonisolated(nonsending) func nonisolatedNonsending() async {
+  let iso = #isolation
+  take(iso: iso)
+}
+
+func take(iso: (any Actor)?) {}
+
+// CHECK-LABEL: // nonisolatedNonsending()
+// CHECK-NEXT: // Isolation: caller_isolation_inheriting
+// CHECK-NEXT: sil hidden @$s39isolated_nonsending_isolation_macro_sil21nonisolatedNonsendingyyYaF : $@convention(thin) @async (@sil_isolated @sil_implicit_leading_param @guaranteed Optional<any Actor>) -> () {
+// CHECK:      bb0(%0 : $Optional<any Actor>):
+// CHECK-NEXT:   hop_to_executor %0 // id: %1
+// CHECK-NEXT:   retain_value %0 // id: %2
+// CHECK-NEXT:   debug_value %0, let, name "iso" // id: %3
+// CHECK-NEXT:   // function_ref take(iso:)
+// CHECK-NEXT:   %4 = function_ref @$s39isolated_nonsending_isolation_macro_sil4take3isoyScA_pSg_tF : $@convention(thin) (@guaranteed Optional<any Actor>) -> () // user: %5
+// CHECK-NEXT:   %5 = apply %4(%0) : $@convention(thin) (@guaranteed Optional<any Actor>) -> ()
+// CHECK-NEXT:   release_value %0 // id: %6
+// CHECK-NEXT:   %7 = tuple () // user: %8
+// CHECK-NEXT:   return %7 // id: %8
+// CHECK-NEXT: } // end sil function '$s39isolated_nonsending_isolation_macro_sil21nonisolatedNonsendingyyYaF'