[6.2] DebugInfo: fix FSPL SILLocation assertion issue #85120
Merged
+17
−4
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
We were reusing the SILLocation from return instructions to generate projections to ultimately destroy values. This fix improves on what we were doing before, by converting the insertion point's SILLocation into a RegularLocation _without dropping_ the source location. If the SILLocation was tied to an ASTNode, it'll carry over the line location for this new regular location. Otherwise, it'll fallback to the prior strategy of producing a line 0 autogenerated location. resolves rdar://163281183 (cherry picked from commit fd06bb1)
|
@swift-ci test |
kavon
changed the title
hborla
approved these changes
Oct 24, 2025
I wouldn't expect a timeout on this test to be related. |
|
@swift-ci test macOS |
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.
Explanation: Instructions that are not returns can be annotated with the
SILLocation::ReturnKind, which is not permitted bySILInstruction::verifyDebugInfo, which only runs in assertion builds.Scope: Anyone using a nightly 6.2 compiler, which is built with asserts, cannot build their project if it contains certain constructs using ~Copyable types.
Issues: rdar://163281183
Original PRs: #85119
Risk: Low.
Testing: Manual testing within a configuration that would reproduce the crash 100% of the time. Patch resolves that crash.
Reviewers: @jckarter