Skip to content

add wb_back on all task switch paths #60617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keno merged 2 commits into from
Jan 15, 2026
Merged

add wb_back on all task switch paths #60617

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a63b365
add wb_back on all task switch paths
vtjnash Jan 9, 2026
f4b6ae5
Apply suggestion from @JeffBezanson
vchuravy Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/task.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,6 @@ static void NOINLINE save_stack(jl_ptls_t ptls, jl_task_t *lastt, jl_task_t **pt
lastt->ctx.copy_stack = nb;
lastt->sticky = 1;
memcpy_stack_a16((uint64_t*)buf, (uint64_t*)frame_addr, nb);
// this task's stack could have been modified after
// it was marked by an incremental collection
// move the barrier back instead of walking it again here
jl_gc_wb_back(lastt);
}

JL_NO_ASAN static void NOINLINE JL_NORETURN restore_stack(jl_ucontext_t *t, jl_ptls_t ptls, char *p)
Expand Down Expand Up @@ -499,6 +495,12 @@ JL_NO_ASAN static void ctx_switch(jl_task_t *lastt)
lastt->ctx.ctx = &lasttstate.ctx;
}
}
// this task's stack or scope field could have been modified after
// it was marked by an incremental collection
// move the barrier back instead of walking the shadow stack again here to check if that is required
// even if killed (dropping the stack) and just the scope field matters,
// let the gc figure that out next time it does a quick mark
jl_gc_wb_back(lastt);

// set up global state for new task and clear global state for old task
t->ptls = ptls;
Expand Down