@@ -4516,27 +4516,27 @@ ProtocolConformance *GetImplicitSendableRequest::evaluate(
4516
4516
return conformance;
4517
4517
};
4518
4518
4519
- // A non-protocol type with a global actor is implicitly Sendable.
4520
- if (nominal->getGlobalActorAttr ()) {
4521
- // If this is a class, check the superclass. If it's already Sendable,
4522
- // form an inherited conformance.
4523
- if (classDecl) {
4524
- if (Type superclass = classDecl->getSuperclass ()) {
4525
- auto classModule = classDecl->getParentModule ();
4526
- if (auto inheritedConformance = TypeChecker::conformsToProtocol (
4527
- classDecl->mapTypeIntoContext (superclass),
4528
- proto, classModule, /* allowMissing=*/ false )) {
4529
- inheritedConformance = inheritedConformance
4530
- .mapConformanceOutOfContext ();
4531
- if (inheritedConformance.isConcrete ()) {
4532
- return ctx.getInheritedConformance (
4533
- nominal->getDeclaredInterfaceType (),
4534
- inheritedConformance.getConcrete ());
4535
- }
4519
+ // If this is a class, check the superclass. If it's already Sendable,
4520
+ // form an inherited conformance.
4521
+ if (classDecl) {
4522
+ if (Type superclass = classDecl->getSuperclass ()) {
4523
+ auto classModule = classDecl->getParentModule ();
4524
+ if (auto inheritedConformance = TypeChecker::conformsToProtocol (
4525
+ classDecl->mapTypeIntoContext (superclass),
4526
+ proto, classModule, /* allowMissing=*/ false )) {
4527
+ inheritedConformance = inheritedConformance
4528
+ .mapConformanceOutOfContext ();
4529
+ if (inheritedConformance.isConcrete ()) {
4530
+ return ctx.getInheritedConformance (
4531
+ nominal->getDeclaredInterfaceType (),
4532
+ inheritedConformance.getConcrete ());
4536
4533
}
4537
4534
}
4538
4535
}
4536
+ }
4539
4537
4538
+ // A non-protocol type with a global actor is implicitly Sendable.
4539
+ if (nominal->getGlobalActorAttr ()) {
4540
4540
// Form the implicit conformance to Sendable.
4541
4541
return formConformance (nullptr );
4542
4542
}
0 commit comments