[6.0] [DebugInfo] Salvage stores + Fix verifier crash for complex switch #73528
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
Member
Snowy1803
commented
May 8, 2024
Snowy1803
commented
- Explanation: Use a generic implementation for salvage store (mem2reg, copy forwarding), and fix how variables are looked up.
- Scope: Salvages lost debug values + Fix IRGen to unique variables correctly
- Original PR: [DebugInfo] Salvage all stores #72964 + [DebugInfo] Fix verifier crash for complex switch #73504
- Risk: Low, only touches debug info. Fixes a crash.
- Testing: New tests have been added, existing ones have been updated
- Issue: Building postgres-nio crashes 6.0 nightly #73338
- Reviewer: @adrian-prantl
(cherry picked from commit 523a769)
(cherry picked from commit 450db6e)
(cherry picked from commit 00a93d9)
(cherry picked from commit 584d1db)
(cherry picked from commit 4bc672e)
When a store is salvaged, its debug_value will have two locations: the location of the store, attached to the debug_value instruction, and the location of the variable, attached to the SILDebugVariable. The getDecl function was using the location of the store, instead of the location of the variable, and so was returning nullptr. (cherry picked from commit 6136183)
An alloc_stack, just like a debug_value, should ignore location overrides for their variable. Fixes swiftlang#73338 rdar://127348128 (cherry picked from commit 95d2479)
|
@swift-ci please test |
adrian-prantl
approved these changes
May 9, 2024
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.