ASTMangler: Fix substitution round-tripping in the DWARF mangler #30840
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
force-pushed
the
dwarf-mangler-substitutions-fix
branch
from
946fa76 to
0a53fd8
Compare
When mangling sugared types for DWARF debug info, we would occassionally mix generic parameter types from different generic environments. Since the mangling for a generic parameter type only recorded the depth and the index, even for distinct sugared forms, the remangler would produce a more 'compact' mangling, by folding together generic parameters that have the same depth/index, but distinct sugarings in the AST. Prevent this from happening by desugaring DWARF types the correct amount, substituting away generic parameters while preserving everything else. Also, re-enable the round-trip verification with the remangler. Fixes <rdar://problem/59496022>, <https://bugs.swift.org/browse/SR-12204>.
slavapestov
force-pushed
the
dwarf-mangler-substitutions-fix
branch
from
0a53fd8 to
3e4b95f
Compare
|
@swift-ci Please test |
|
@swift-ci Please test source compatibility |
|
@swift-ci Please test source compatibility Debug |
|
@slavapestov Thanks for fixing this! |
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.
When mangling sugared types for DWARF debug info, we would
occassionally mix generic parameter types from different
generic environments. Since the mangling for a generic
parameter type only recorded the depth and the index, even
for distinct sugared forms, the remangler would produce a
more 'compact' mangling, by folding together generic parameters
that have the same depth/index, but distinct sugarings in the
AST.
Prevent this from happening by desugaring DWARF types the
correct amount, substituting away generic parameters while
preserving everything else.
Also, re-enable the round-trip verification with the remangler.
Fixes rdar://problem/59496022, https://bugs.swift.org/browse/SR-12204.