Skip to content

Commit 47e82c8

Browse files
committed
(cleanup) Uncomment an assertion that now holds.
1 parent 2d1eb19 commit 47e82c8

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/libstd/rt/kill.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,10 @@ impl BlockedTask {
205205
let flag_arc = match task.death.spare_kill_flag.take() {
206206
Some(spare_flag) => spare_flag,
207207
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);
213212
(*task.death.kill_handle.get_ref().get()).killed.clone()
214213
}
215214
};

0 commit comments

Comments
 (0)