Skip to content

Commit b28a061

Browse files
authored
Merge pull request #82816 from DougGregor/isolated-conformance-without-concurrency-runtime-6.2
[6.2] [Runtime] Don't fail conformances when the global actor hook is missing
2 parents d03fd67 + c269677 commit b28a061

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

stdlib/public/runtime/ProtocolConformance.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1474,8 +1474,9 @@ static bool swift_isInConformanceExecutionContextImpl(
14741474
return true;
14751475

14761476
if (context->globalActorIsolationType) {
1477+
// If the hook is not installed, assume we're on the right actor.
14771478
if (!_swift_task_isCurrentGlobalActorHook)
1478-
return false;
1479+
return true;
14791480

14801481
// Check whether we are running on this global actor.
14811482
if (!_swift_task_isCurrentGlobalActorHook(

0 commit comments

Comments
 (0)