IRGen/ABI: fix count of requirements in getAddrOfGenericEnvironment #85450
+35
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
slavapestov
reviewed
Nov 12, 2025
|
|
||
| // Generic requirements | ||
| irgen::addGenericRequirements(*this, fields, signature); | ||
| irgen::addGenericRequirements(*this, fields, signature, reqs, inverses); |
Contributor
There was a problem hiding this comment.
Do the other callers of the three-argument overload need to be audited to see if they need the same fix? Maybe it should be removed?
Member
There was a problem hiding this comment.
Removing it is probably a good idea; it's too easy to misuse the 3-argument version.
Member
Author
There was a problem hiding this comment.
I think it's worth doing the auditing in a follow-up PR. I didn't see any other obvious mistakes in other callers of the 3 argument version.
Member
Author
|
@swift-ci smoke test macOS |
1 similar comment
Member
Author
|
@swift-ci smoke test macOS |
Member
|
@swift-ci test |
`irgen::addGenericRequirements` will later filter out Copyable and Escapable requirements, so this field's count isn't accurate if it's using the pre-filtered number. This should in theory only affect the metadata emission for keypaths, specifically, the caller `IRGenModule::getAddrOfKeyPathPattern`.
kavon
force-pushed
the
keypath-metadata-fix
branch
from
fb06e8b to
38af19b
Compare
Member
Author
|
@swift-ci test |
DougGregor
approved these changes
Dec 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
irgen::addGenericRequirementswill later filter out Copyable and Escapable requirements, so this field's count isn't accurate if it's using the pre-filtered number.This should in theory only affect the metadata emission for keypaths, specifically, the caller
IRGenModule::getAddrOfKeyPathPattern.NOTE: This is an ABI change, as any keypath formed using a generic type that conforms to a noncopyable or nonescapable protocol will have its count of conformance requirements change to a corrected, smaller number.