Demangle @unowned_inner_pointer fix #2328
Merged
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
Fixed an apparent typo where two cases tested for the same lowercase 'd' pattern, resulting in one case never being used. According to the comment block, doc/ABI.rst and lib/AST/Mangle.cpp, the second case should be an uppercase 'D'.
Changed 'd' to 'D' to match corresponding fix in Demangle.cpp.
Corresponds to fix in Demangle.cpp
Corresponding to fix in Demangle.cpp.
mattgallagher
changed the title
Contributor
|
I think I was just following the Demangle implementation in Remangle. LGTM. |
MaxDesiatov
pushed a commit
that referenced
this pull request
Apr 19, 2021
[pull] swiftwasm from main
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
What's in this pull request?
This is a fix for an apparent typo affecting demangling and remangling of @unowned_inner_pointer. This bug was discovered while exploring lib/basic/Demangle.cpp (it did not occur during testing – so it's not obviously a serious problem) but the fixed logic appears to be valid according to doc/AST.rst. I've added test cases to test/Demangle/Inputs/manglings.txt to exercise the code path (these cases are duplicates of the preceding "@unowned" result tests, changed to be "@unowned_inner_pointer").
Curiously, I had to add a corresponding fix to lib/Basic/Remangle.cpp to allow "swift-demangle -test-remangle" to pass. I assume it's coincidence or convergent evolution that caused both Demangle.cpp and Remangle.cpp to have the same typo – but there's a possibility there's something else going on that I don't know about (if so, then the comment in Demangle.cpp and AST.rst are incorrect).
Resolved bug number: [none]
This is not associated with any bug.
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Note: Only members of the Apple organization can trigger swift-ci.