Skip to content

Commit 191db1e

Browse files
committed
[Runtime] TargetProtocolDescriptor is not a TrailingGenericContextObjects.
Protocols are never generic, so don't inherit from TrailingGenericContextObjects. Instead, directly use swift::ABI::TrailingObjects. Since protocols are never generic, this doesn't actually affect layout at all; it's cleanup.
1 parent 3039fb3 commit 191db1e

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

include/swift/ABI/Metadata.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2891,17 +2891,15 @@ struct TargetAnonymousContextDescriptor final
28912891
template<typename Runtime>
28922892
struct TargetProtocolDescriptor final
28932893
: TargetContextDescriptor<Runtime>,
2894-
TrailingGenericContextObjects<
2894+
swift::ABI::TrailingObjects<
28952895
TargetProtocolDescriptor<Runtime>,
2896-
TargetGenericContextDescriptorHeader,
28972896
TargetGenericRequirementDescriptor<Runtime>,
28982897
TargetProtocolRequirement<Runtime>>
28992898
{
29002899
private:
29012900
using TrailingObjects
2902-
= TrailingGenericContextObjects<
2901+
= swift::ABI::TrailingObjects<
29032902
TargetProtocolDescriptor<Runtime>,
2904-
TargetGenericContextDescriptorHeader,
29052903
TargetGenericRequirementDescriptor<Runtime>,
29062904
TargetProtocolRequirement<Runtime>>;
29072905

@@ -2911,9 +2909,6 @@ struct TargetProtocolDescriptor final
29112909
using OverloadToken = typename TrailingObjects::template OverloadToken<T>;
29122910

29132911
public:
2914-
using TrailingObjects::getGenericContext;
2915-
using TrailingObjects::numTrailingObjects;
2916-
29172912
size_t numTrailingObjects(
29182913
OverloadToken<TargetGenericRequirementDescriptor<Runtime>>) const {
29192914
return NumRequirementsInSignature;

0 commit comments

Comments
 (0)