Protect r_task() from panics and detect cancelled handlers#1269
Open
lionel- wants to merge 1 commit into
Open
Conversation
lionel-
force-pushed
the
oak/salsa-27-wire-url
branch
from
b06b7da to
ce5b201
Compare
lionel-
force-pushed
the
oak/salsa-28-rtask-unwind
branch
from
c692881 to
a05a82d
Compare
This was referenced Jun 12, 2026
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
1 participant
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.
Branched from #1268
Progress towards #1212
Currently a Salsa cancellation panic can't be triggered in an
r_task()because all calls tor_task()that query Salsa (for completions) happen on the main loop, during which the Salsa DB is pinned (since the main loop is the sole writer). But I thought better to be safe. We now:Catch all panics in
r_task()and reraise them. This is much safer, since it's UB to panic over C frames (top-level-exec and with-calling-handlers frames in particular). If a cancellation is ever raised fromr_task()(e.g. if called from a background thread), it would be safely re-raised the same way, and would be caught byspawn_blocking().Catch Salsa cancellation panics in
respond()and reply to the frontend withContentModified(follows Rust-Analyser).