Skip to content
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.

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

Remove JULIA_ENABLE_THREADS feature flag #32685

Merged
merged 3 commits into from
Aug 11, 2019
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fixup macos -- was ifdef not ifndef
  • Loading branch information
mbauman committed Jul 26, 2019
commit a52e5d4bd35a57dae808b94a21fe3704f99e3ca6
4 changes: 4 additions & 0 deletions src/signals-mach.c
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@ kern_return_t catch_exception_raise(mach_port_t exception_port,
HANDLE_MACH_ERROR("thread_get_state", ret);
uint64_t fault_addr = exc_state.__faultvaddr;
if (jl_addr_is_safepoint(fault_addr)) {
if (jl_mach_gc_wait(ptls2, thread, tid))
return KERN_SUCCESS;
if (ptls2->tid != 0)
return KERN_SUCCESS;
if (ptls2->defer_signal) {
jl_safepoint_defer_sigint();
}
Expand Down