From c61ead1aa0b05f21e06e14649771c808c8ecae3a Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 11 Mar 2020 00:21:13 -0400 Subject: [PATCH] ABI: Fix return type of TargetGenericRequirementDescriptor::getConformance() --- include/swift/ABI/Metadata.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/swift/ABI/Metadata.h b/include/swift/ABI/Metadata.h index 53238489653af..c298fa92153c7 100644 --- a/include/swift/ABI/Metadata.h +++ b/include/swift/ABI/Metadata.h @@ -2720,7 +2720,7 @@ class TargetGenericRequirementDescriptor { /// The conformance the param is constrained to use. /// /// Only valid if the requirement has SameConformance kind. - RelativeIndirectablePointer, + RelativeIndirectablePointer, /*nullable*/ false> Conformance; /// The kind of layout constraint. @@ -2758,7 +2758,7 @@ class TargetGenericRequirementDescriptor { /// Retrieve the protocol conformance record for a SameConformance /// requirement. - const TargetProtocolConformanceRecord *getConformance() const { + const TargetProtocolConformanceDescriptor *getConformance() const { assert(getKind() == GenericRequirementKind::SameConformance); return Conformance; }