Skip to content

ABI: Fix return type of TargetGenericRequirementDescriptor::getConformance() #30346

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 1 commit into from
Mar 11, 2020
Merged

ABI: Fix return type of TargetGenericRequirementDescriptor::getConformance() #30346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions include/swift/ABI/Metadata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2720,7 +2720,7 @@ class TargetGenericRequirementDescriptor {
/// The conformance the param is constrained to use.
///
/// Only valid if the requirement has SameConformance kind.
RelativeIndirectablePointer<TargetProtocolConformanceRecord<Runtime>,
RelativeIndirectablePointer<TargetProtocolConformanceDescriptor<Runtime>,
/*nullable*/ false> Conformance;

/// The kind of layout constraint.
Expand Down Expand Up @@ -2758,7 +2758,7 @@ class TargetGenericRequirementDescriptor {

/// Retrieve the protocol conformance record for a SameConformance
/// requirement.
const TargetProtocolConformanceRecord<Runtime> *getConformance() const {
const TargetProtocolConformanceDescriptor<Runtime> *getConformance() const {
assert(getKind() == GenericRequirementKind::SameConformance);
return Conformance;
}
Expand Down