Skip to content

🍒[6.1][Distributed] Dont crash on specificly names methods which triggered Distributed checks #80460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 10, 2025
Merged

🍒[6.1][Distributed] Dont crash on specificly names methods which triggered Distributed checks #80460

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1805f8e
[Distributed] Harden detecting adhoc req methods, don't crash when mi…
ktoso Apr 2, 2025
2e5a0f4
Delete test/Distributed/distributed_actor_adhoc_names_in_non_da_types…
ktoso Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions lib/AST/DistributedDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,10 @@ bool AbstractFunctionDecl::isDistributedActorSystemRemoteCall(bool isVoidReturn)
}

// === Must be declared in a 'DistributedActorSystem' conforming type
ProtocolDecl *systemProto =
C.getDistributedActorSystemDecl();
ProtocolDecl *systemProto = C.getDistributedActorSystemDecl();
if (!systemProto) {
return false;
}

auto systemNominal = DC->getSelfNominalTypeDecl();
auto distSystemConformance = lookupConformance(
Expand Down Expand Up @@ -794,6 +796,9 @@ AbstractFunctionDecl::isDistributedTargetInvocationEncoderRecordArgument() const
// === Must be declared in a 'DistributedTargetInvocationEncoder' conforming type
ProtocolDecl *encoderProto =
C.getProtocol(KnownProtocolKind::DistributedTargetInvocationEncoder);
if (!encoderProto) {
return false;
}

auto encoderNominal = getDeclContext()->getSelfNominalTypeDecl();
auto protocolConformance = lookupConformance(
Expand Down Expand Up @@ -925,6 +930,9 @@ AbstractFunctionDecl::isDistributedTargetInvocationEncoderRecordReturnType() con
// === Must be declared in a 'DistributedTargetInvocationEncoder' conforming type
ProtocolDecl *encoderProto =
C.getProtocol(KnownProtocolKind::DistributedTargetInvocationEncoder);
if (!encoderProto) {
return false;
}

auto encoderNominal = getDeclContext()->getSelfNominalTypeDecl();
auto protocolConformance = lookupConformance(
Expand Down Expand Up @@ -1051,6 +1059,9 @@ AbstractFunctionDecl::isDistributedTargetInvocationEncoderRecordErrorType() cons
// === Must be declared in a 'DistributedTargetInvocationEncoder' conforming type
ProtocolDecl *encoderProto =
C.getProtocol(KnownProtocolKind::DistributedTargetInvocationEncoder);
if (!encoderProto) {
return false;
}

auto encoderNominal = getDeclContext()->getSelfNominalTypeDecl();
auto protocolConformance = lookupConformance(
Expand Down Expand Up @@ -1158,7 +1169,9 @@ AbstractFunctionDecl::isDistributedTargetInvocationDecoderDecodeNextArgument() c
// === Must be declared in a 'DistributedTargetInvocationEncoder' conforming type
ProtocolDecl *decoderProto =
C.getProtocol(KnownProtocolKind::DistributedTargetInvocationDecoder);

if (!decoderProto) {
return false;
}
auto decoderNominal = getDeclContext()->getSelfNominalTypeDecl();
auto protocolConformance = lookupConformance(
decoderNominal->getDeclaredInterfaceType(), decoderProto);
Expand Down Expand Up @@ -1251,6 +1264,9 @@ AbstractFunctionDecl::isDistributedTargetInvocationResultHandlerOnReturn() const
// === Must be declared in a 'DistributedTargetInvocationEncoder' conforming type
ProtocolDecl *decoderProto =
C.getProtocol(KnownProtocolKind::DistributedTargetInvocationResultHandler);
if (!decoderProto) {
return false;
}

auto decoderNominal = getDeclContext()->getSelfNominalTypeDecl();
auto protocolConformance = lookupConformance(
Expand Down