|
80 | 80 |
|
81 | 81 | using namespace llvm; |
82 | 82 |
|
83 | | -static void SignalHandler(int Sig); // defined below. |
| 83 | +static void SignalHandler(int Sig, siginfo_t *Info, void *); |
84 | 84 | static void InfoSignalHandler(int Sig); // defined below. |
85 | 85 |
|
86 | 86 | using SignalHandlerFunctionType = void (*)(); |
@@ -313,8 +313,8 @@ static void RegisterHandlers() { // Not signal-safe. |
313 | 313 |
|
314 | 314 | switch (Kind) { |
315 | 315 | case SignalKind::IsKill: |
316 | | - NewHandler.sa_handler = SignalHandler; |
317 | | - NewHandler.sa_flags = SA_NODEFER | SA_RESETHAND | SA_ONSTACK; |
| 316 | + NewHandler.sa_sigaction = SignalHandler; |
| 317 | + NewHandler.sa_flags = SA_NODEFER | SA_RESETHAND | SA_ONSTACK | SA_SIGINFO; |
318 | 318 | break; |
319 | 319 | case SignalKind::IsInfo: |
320 | 320 | NewHandler.sa_handler = InfoSignalHandler; |
@@ -370,7 +370,7 @@ void sys::CleanupOnSignal(uintptr_t Context) { |
370 | 370 | } |
371 | 371 |
|
372 | 372 | // The signal handler that runs. |
373 | | -static void SignalHandler(int Sig) { |
| 373 | +static void SignalHandler(int Sig, siginfo_t *Info, void *) { |
374 | 374 | // Restore the signal behavior to default, so that the program actually |
375 | 375 | // crashes when we return and the signal reissues. This also ensures that if |
376 | 376 | // we crash in our signal handler that the program will terminate immediately |
@@ -412,6 +412,11 @@ static void SignalHandler(int Sig) { |
412 | 412 | if (Sig == SIGILL || Sig == SIGFPE || Sig == SIGTRAP) |
413 | 413 | raise(Sig); |
414 | 414 | #endif |
| 415 | + |
| 416 | + // Signal sent from another process, do not assume that continuing the |
| 417 | + // execution would re-raise it. |
| 418 | + if (Info->si_pid != getpid()) |
| 419 | + raise(Sig); |
415 | 420 | } |
416 | 421 |
|
417 | 422 | static void InfoSignalHandler(int Sig) { |
|
0 commit comments