[DebugInfo] Fix verifier crash for complex switch #73504
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
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.
An alloc_stack, just like a debug_value, should ignore location overrides for their variable. Fixes swiftlang#73338 rdar://127348128
|
@swift-ci please test |
1 similar comment
|
@swift-ci please test |
adrian-prantl
approved these changes
May 8, 2024
| var x = ns | ||
| x = ns2 | ||
| return x as? T // expected-remark @:12 {{conditional runtime cast of value with type 'NS' to 'T'}} | ||
| // expected-note @-9:42 {{of 'ns2'}} | ||
| // expected-note @-5:42 {{of 'ns2'}} | ||
| // expected-note @-4:7 {{of 'x'}} |
There was a problem hiding this comment.
Nice, so this actually fixes another bug?
There was a problem hiding this comment.
Yes, now that getDecl() returns the correct variable declaration after a store, this pass is able to point back to the x value! After optimizations. the SILValue will be associated with both debug variables, so the pass prints both of them.
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.
An alloc_stack, just like a debug_value, should ignore location overrides for their variable.
Additionally, for this to work correctly, we need to use the variable's location and not the instruction's location when generating anonymous variables in IRGen (which uses getDecl).
To implement this more easily, the variable's location is always set, and when there is no override, the duplicate location information is removed in AllocStackInst::create.
Fixes #73338
rdar://127348128