bug: Avoid panic in Backtrace::catpure if query_stack is already mutably borrowed#835
Merged
MichaReiser merged 1 commit intosalsa-rs:masterfrom Apr 30, 2025
Conversation
✅ Deploy Preview for salsa-rs canceled.
|
CodSpeed Performance ReportMerging #835 will not alter performanceComparing Summary
|
eec7f1a to
ac99daf
Compare
ac99daf to
c46f2e7
Compare
Merged
This was referenced Apr 30, 2025
Member
|
That does make this less useful for panic handlers (noticed r-a always aborts now when we panic thanks to the double panic haha) |
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
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.
This PR fixes a panic in
Backtrace::catpureiflocal_state.query_stackis already mutably borrowed byreturning
None.This was possible because some of our cycle queries used
with_query_stackwhen panicking to include the query stackand
with_query_stackalways aquired a mutable borrow. I splitwith_query_stackinto a reference, mutable reference, andtryvariantwhich should avoid this from triggering in most places