Skip to content

Commit

Permalink
Merge branch 'master' into rationalize_irrational
Browse files Browse the repository at this point in the history
  • Loading branch information
nsajko authored Jan 24, 2025
2 parents 940b99b + 6eb42db commit 3373839
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Compiler/test/abioverride.jl
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ let world = Base.tls_world_age()
## Remove the argument
resize!(new_source.slotnames, 2)
resize!(new_source.slotflags, 2)
new_source.nargs = 2

# Construct the CodeInstance from the modified CodeInfo data
global new_ci = Core.CodeInstance(Core.ABIOverride(Tuple{typeof(myplus), Int}, mi),
Expand Down
2 changes: 1 addition & 1 deletion src/signals-unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ void jl_install_default_signal_handlers(void)
memset(&act, 0, sizeof(struct sigaction));
sigemptyset(&act.sa_mask);
act.sa_sigaction = usr2_handler;
act.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_RESTART;
act.sa_flags = SA_SIGINFO | SA_RESTART;
if (sigaction(SIGUSR2, &act, NULL) < 0) {
jl_errorf("fatal error: sigaction: %s", strerror(errno));
}
Expand Down

0 comments on commit 3373839

Please sign in to comment.