Runtime: Properly handle demangling nested generic typerefs with symbolic manglings. #15781
+30
−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
…olic manglings. The demangling tree for a symbolic reference doesn't indicate the generic context depth of the referenced type, so we have to form the type metadata from whole cloth without incrementally building up nested types as we do for concrete mangled types. Notice when DecodedMetadataBuilder is passed a context descriptor ref without a parent and directly form the entire type in this case. Fixes rdar://problem/38891999.
|
@swift-ci Please test |
DougGregor
approved these changes
Apr 6, 2018
slavapestov
reviewed
Apr 6, 2018
| class d {} | ||
| struct e<f> { | ||
| var constraints: [Int: a<f>.c] = [:] | ||
| } |
There was a problem hiding this comment.
Another silly case to test is a type nested inside an extension of a generic type that makes one of its generic parameters concrete, or more generally, any constrained extension
There was a problem hiding this comment.
Yeah, having a couple levels of generic/non-generic nesting interleaved is great for sussing out bugs in this code. test/Runtime/demangleToMetadata.swift has some examples.
|
@DougGregor In those libraries IIRC we resolve symbolic mangling directly into their mangling tree, since there isn't as much performance win to be had preserving the direct pointer to the type descriptor, so I think they should be OK. I'll double check though, thanks for the suggestion! |
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.
The demangling tree for a symbolic reference doesn't indicate the generic context depth of the referenced type, so we have to form the type metadata from whole cloth without incrementally building up nested types as we do for concrete mangled types. Notice when DecodedMetadataBuilder is passed a context descriptor ref without a parent and directly form the entire type in this case. Fixes rdar://problem/38891999.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.