Runtime: Fix runtime type resolution when mangled names refer to protocol extensions with Self same type constraints. #74997
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
|
@swift-ci Please test |
al45tair
approved these changes
Jul 8, 2024
|
macOS failure was about availability of |
…ocol extensions with Self same type constraints.
If a type or opaque type descriptor appears inside of a protocol extension of the form:
```
extension P where Self == Nominal { ... }
```
then the runtime representation of the extension context was interpreted by the runtime
demangler as a nominal type extension, even though the parameterization is on the
`<Self>` generic signature of the protocol extension and not the generic signature of
the nominal type. This would cause spurious rejection of mangled names referencing the
extension context because we mistakenly thought that the type arguments mismatched with
the nominal type signature rather than matching them to the extension context.
Add some code to `_findExtendedTypeContextDescriptor` to detect when an extension is
a protocol extension with a `Self == SameType` constraint, and pass the extension along
rather than treating it as a nominal type extension. Fixes rdar://130168101.
jckarter
force-pushed
the
protocol-extension-self-same-type-runtime-resolution
branch
from
baddbb5 to
e0df8ff
Compare
|
@swift-ci Please test |
mikeash
approved these changes
Jul 8, 2024
| @@ -402,6 +402,38 @@ _findExtendedTypeContextDescriptor(const ContextDescriptor *maybeExtension, | |||
| Demangle::NodePointer &node = demangledNode ? *demangledNode : localNode; | |||
|
|
|||
| auto mangledName = extension->getMangledExtendedContext(); | |||
|
|
|||
| // A extension of the form `extension Protocol where Self == ConcreteType` | |||
There was a problem hiding this comment.
Suggested change
| // A extension of the form `extension Protocol where Self == ConcreteType` | |
| // An extension of the form `extension Protocol where Self == ConcreteType` |
Extreme nitpick.
|
@swift-ci Please test macOS |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
…ocol extensions with Self same type constraints.
If a type or opaque type descriptor appears inside of a protocol extension of the form:
then the runtime representation of the extension context was interpreted by the runtime demangler as a nominal type extension, even though the parameterization is on the
<Self>generic signature of the protocol extension and not the generic signature of the nominal type. This would cause spurious rejection of mangled names referencing the extension context because we mistakenly thought that the type arguments mismatched with the nominal type signature rather than matching them to the extension context.Add some code to
_findExtendedTypeContextDescriptorto detect when an extension is a protocol extension with aSelf == SameTypeconstraint, and pass the extension along rather than treating it as a nominal type extension. Fixes rdar://130168101.