File tree Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -205,11 +205,10 @@ impl BlockedTask {
205
205
let flag_arc = match task. death . spare_kill_flag . take ( ) {
206
206
Some ( spare_flag) => spare_flag,
207
207
None => {
208
- // FIXME(#7544): Uncomment this when terminate_current_task
209
- // stops being *terrible*. That's the only place that violates
210
- // the assumption of "becoming unkillable will fail if the
211
- // task was killed".
212
- // rtassert!(task.unwinder.unwinding);
208
+ // A task that kills us won't have a spare kill flag to
209
+ // give back to us, so we restore it ourselves here. This
210
+ // situation should only arise when we're already failing.
211
+ rtassert ! ( task. unwinder. unwinding) ;
213
212
( * task. death . kill_handle . get_ref ( ) . get ( ) ) . killed . clone ( )
214
213
}
215
214
} ;
You can’t perform that action at this time.
0 commit comments