Skip to content

Commit 0bf7b29

Browse files
ktosoktoso
authored
Merge pull request #82826 from ktoso/pick-wip-correct-isolated-handling-with-caller-isolation
1 parent 5fcf371 commit 0bf7b29

File tree

5 files changed

+126
-9
lines changed

5 files changed

+126
-9
lines changed

‎lib/SILGen/SILGenConcurrency.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ setExpectedExecutorForParameterIsolation(SILGenFunction &SGF,
7575
// argument.
7676
if (actorIsolation.getKind() == ActorIsolation::CallerIsolationInheriting) {
7777
auto *isolatedArg = SGF.F.maybeGetIsolatedArgument();
78-
assert(isolatedArg &&
78+
ASSERT(isolatedArg &&
7979
"Caller Isolation Inheriting without isolated parameter");
8080
ManagedValue isolatedMV;
8181
if (isolatedArg->getOwnershipKind() == OwnershipKind::Guaranteed) {

‎lib/SILGen/SILGenExpr.cpp‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7287,19 +7287,34 @@ RValue RValueEmitter::visitMacroExpansionExpr(MacroExpansionExpr *E,
72877287

72887288
RValue RValueEmitter::visitCurrentContextIsolationExpr(
72897289
CurrentContextIsolationExpr *E, SGFContext C) {
7290-
// If we are in an actor initializer that is isolated to self, the
7291-
// current isolation is flow-sensitive; use that instead of the
7292-
// synthesized expression.
7293-
if (auto ctor = dyn_cast_or_null<ConstructorDecl>(
7294-
SGF.F.getDeclRef().getDecl())) {
7295-
auto isolation = getActorIsolation(ctor);
7296-
if (ctor->isDesignatedInit() &&
7290+
auto afd =
7291+
dyn_cast_or_null<AbstractFunctionDecl>(SGF.F.getDeclRef().getDecl());
7292+
if (afd) {
7293+
auto isolation = getActorIsolation(afd);
7294+
auto ctor = dyn_cast_or_null<ConstructorDecl>(afd);
7295+
if (ctor && ctor->isDesignatedInit() &&
72977296
isolation == ActorIsolation::ActorInstance &&
72987297
isolation.getActorInstance() == ctor->getImplicitSelfDecl()) {
7298+
// If we are in an actor initializer that is isolated to self, the
7299+
// current isolation is flow-sensitive; use that instead of the
7300+
// synthesized expression.
72997301
auto isolationValue =
73007302
SGF.emitFlowSensitiveSelfIsolation(E, isolation);
73017303
return RValue(SGF, E, isolationValue);
73027304
}
7305+
7306+
if (isolation == ActorIsolation::CallerIsolationInheriting) {
7307+
auto *isolatedArg = SGF.F.maybeGetIsolatedArgument();
7308+
assert(isolatedArg &&
7309+
"Caller Isolation Inheriting without isolated parameter");
7310+
ManagedValue isolatedMV;
7311+
if (isolatedArg->getOwnershipKind() == OwnershipKind::Guaranteed) {
7312+
isolatedMV = ManagedValue::forBorrowedRValue(isolatedArg);
7313+
} else {
7314+
isolatedMV = ManagedValue::forUnmanagedOwnedValue(isolatedArg);
7315+
}
7316+
return RValue(SGF, E, isolatedMV);
7317+
}
73037318
}
73047319

73057320
return visit(E->getActor(), C);

‎lib/Sema/TypeCheckConcurrency.cpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4393,10 +4393,15 @@ namespace {
43934393

43944394
case ActorIsolation::Unspecified:
43954395
case ActorIsolation::Nonisolated:
4396-
case ActorIsolation::CallerIsolationInheriting:
43974396
case ActorIsolation::NonisolatedUnsafe:
43984397
actorExpr = new (ctx) NilLiteralExpr(loc, /*implicit=*/false);
43994398
break;
4399+
case ActorIsolation::CallerIsolationInheriting:
4400+
// For caller isolation this expression will be replaced in SILGen
4401+
// because we're adding an implicit isolated parameter that #isolated
4402+
// must resolve to, but cannot do so during AST expansion quite yet.
4403+
actorExpr = new (ctx) NilLiteralExpr(loc, /*implicit=*/false);
4404+
break;
44004405
}
44014406

44024407

‎test/Concurrency/Runtime/isolated_macro_in_nonisolated_nonsending_func.swift‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library) | %FileCheck %s --dump-input=always
2+
3+
// REQUIRES: concurrency
4+
// REQUIRES: executable_test
5+
// REQUIRES: concurrency_runtime
6+
7+
// rdar://78109470
8+
// UNSUPPORTED: back_deployment_runtime
9+
// UNSUPPORTED: freestanding
10+
11+
import _Concurrency
12+
import StdlibUnittest
13+
14+
@main struct Main {
15+
static func main() async {
16+
await explicitIsolatedParam()
17+
// CHECK: go - explicitIsolatedParam
18+
// CHECK: outerIsolation = #isolation = Optional(Swift.MainActor)
19+
// CHECK: Task{} #isolation = nil
20+
// CHECK: Task{ [outerIsolation] } outerIsolation = Optional(Swift.MainActor), #iso = Optional(Swift.MainActor)
21+
// CHECK: done - explicitIsolatedParam
22+
23+
print()
24+
await nonisolatedNonsending()
25+
// CHECK: go - nonisolatedNonsending
26+
// CHECK: outerIsolation = #isolation = Optional(Swift.MainActor)
27+
// CHECK: Task{} #isolation = nil
28+
// CHECK: Task{ [outerIsolation] } outerIsolation = Optional(Swift.MainActor), #iso = nil
29+
// CHECK: done - nonisolatedNonsending
30+
}
31+
}
32+
33+
func explicitIsolatedParam(isolation: isolated (any Actor)? = #isolation) async {
34+
print("go - \(#function)")
35+
MainActor.assertIsolated()
36+
37+
let outerIsolation = #isolation
38+
print("outerIsolation = #isolation = \(String(describing: outerIsolation))")
39+
40+
await Task {
41+
let iso = #isolation
42+
print("Task{} #isolation = \(String(describing: iso))")
43+
}.value
44+
45+
await Task {
46+
let iso = #isolation
47+
print("Task{ [outerIsolation] } outerIsolation = \(String(describing: isolation)), #iso = \(String(describing: iso))")
48+
}.value
49+
50+
print("done - \(#function)")
51+
}
52+
53+
54+
nonisolated(nonsending) func nonisolatedNonsending() async {
55+
print("go - \(#function)")
56+
MainActor.assertIsolated()
57+
58+
let outerIsolation = #isolation
59+
print("outerIsolation = #isolation = \(String(describing: outerIsolation))")
60+
61+
await Task {
62+
let iso = #isolation
63+
print("Task{} #isolation = \(String(describing: iso))")
64+
}.value
65+
66+
await Task {
67+
let iso = #isolation
68+
print("Task{ [outerIsolation] } outerIsolation = \(String(describing: outerIsolation)), #iso = \(String(describing: iso))")
69+
}.value
70+
71+
print("done - \(#function)")
72+
}

‎test/Concurrency/isolated_nonsending_isolation_macro_sil.swift‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// RUN: %target-swift-frontend -parse-as-library -emit-sil %s | %FileCheck %s
2+
3+
// REQUIRES: concurrency
4+
5+
nonisolated(nonsending) func nonisolatedNonsending() async {
6+
let iso = #isolation
7+
take(iso: iso)
8+
}
9+
10+
func take(iso: (any Actor)?) {}
11+
12+
// CHECK-LABEL: // nonisolatedNonsending()
13+
// CHECK-NEXT: // Isolation: caller_isolation_inheriting
14+
// CHECK-NEXT: sil hidden @$s39isolated_nonsending_isolation_macro_sil21nonisolatedNonsendingyyYaF : $@convention(thin) @async (@sil_isolated @sil_implicit_leading_param @guaranteed Optional<any Actor>) -> () {
15+
// CHECK: bb0(%0 : $Optional<any Actor>):
16+
// CHECK-NEXT: hop_to_executor %0 // id: %1
17+
// CHECK-NEXT: retain_value %0 // id: %2
18+
// CHECK-NEXT: debug_value %0, let, name "iso" // id: %3
19+
// CHECK-NEXT: // function_ref take(iso:)
20+
// CHECK-NEXT: %4 = function_ref @$s39isolated_nonsending_isolation_macro_sil4take3isoyScA_pSg_tF : $@convention(thin) (@guaranteed Optional<any Actor>) -> () // user: %5
21+
// CHECK-NEXT: %5 = apply %4(%0) : $@convention(thin) (@guaranteed Optional<any Actor>) -> ()
22+
// CHECK-NEXT: release_value %0 // id: %6
23+
// CHECK-NEXT: %7 = tuple () // user: %8
24+
// CHECK-NEXT: return %7 // id: %8
25+
// CHECK-NEXT: } // end sil function '$s39isolated_nonsending_isolation_macro_sil21nonisolatedNonsendingyyYaF'

0 commit comments

Comments
 (0)