Revert "reset signal handlers to their system defaults if handling crash with UseOSErrorReporting"

This reverts commit f634064.

Author: gerard-ziemski

src/hotspot/os/posix/signals_posix.cpp

@@ -1414,17 +1414,6 @@ void PosixSignals::hotspot_sigmask(Thread* thread) {
   }
 }
 
-void PosixSignals::clear_signal_handlers() {
-  // set signal handlers back to their defaults
-  struct sigaction defaulthandler;
-  sigemptyset(&defaulthandler.sa_mask);
-
-  defaulthandler.sa_handler = SIG_DFL;
-  for (int i = 0; i < NSIG + 1; i++) {
-    sigaction(i, &defaulthandler, NULL);
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // suspend/resume support
 

src/hotspot/os/posix/signals_posix.hpp

@@ -48,11 +48,6 @@ class PosixSignals : public AllStatic {
   static int unblock_thread_signal_mask(const sigset_t *set);
   static void hotspot_sigmask(Thread* thread);
 
-  // set signal handlers back to their system defaults (i.e. no handler)
-  // to let the process die at the crash site (so that the OS can
-  // catch and process it)
-  static void clear_signal_handlers();
-
   static void print_signal_handler(outputStream* st, int sig, char* buf, size_t buflen);
 
   static address ucontext_get_pc(const ucontext_t* ctx);

src/hotspot/os/posix/vmError_posix.cpp

@@ -138,7 +138,7 @@ static void crash_handler(int sig, siginfo_t* info, void* ucVoid) {
   VMError::report_and_die(NULL, sig, pc, info, ucVoid);
 }
 
-void VMError::rearm_signal_handlers() {
+void VMError::reset_signal_handlers() {
   // install signal handlers for all synchronous program error signals
   sigset_t newset;
   sigemptyset(&newset);
@@ -151,10 +151,6 @@ void VMError::rearm_signal_handlers() {
   PosixSignals::unblock_thread_signal_mask(&newset);
 }
 
-void VMError::clear_signal_handlers() {
-  PosixSignals::clear_signal_handlers();
-}
-
 // Write a hint to the stream in case siginfo relates to a segv/bus error
 // and the offending address points into CDS archive.
 void VMError::check_failing_cds_access(outputStream* st, const void* siginfo) {

src/hotspot/os/windows/vmError_windows.cpp

@@ -44,13 +44,10 @@ LONG WINAPI crash_handler(struct _EXCEPTION_POINTERS* exceptionInfo) {
   return EXCEPTION_CONTINUE_SEARCH;
 }
 
-void VMError::rearm_signal_handlers() {
+void VMError::reset_signal_handlers() {
   SetUnhandledExceptionFilter(crash_handler);
 }
 
-void VMError::clear_signal_handlers() {
-}
-
 // Write a hint to the stream in case siginfo relates to a segv/bus error
 // and the offending address points into CDS archive.
 void VMError::check_failing_cds_access(outputStream* st, const void* siginfo) {

src/hotspot/share/utilities/vmError.cpp

@@ -1429,19 +1429,14 @@ void VMError::report_and_die(int id, const char* message, const char* detail_fmt
 
     os::check_dump_limit(buffer, sizeof(buffer));
 
-    // Rearm signal handlers (Linux, macOS) or exception filter (Windows)
-    // to make sure that recursive crashes are handled properly.
-    rearm_signal_handlers();
+    // reset signal handlers or exception filter; make sure recursive crashes
+    // are handled properly.
+    reset_signal_handlers();
   } else {
     // If UseOsErrorReporting we call this for each level of the call stack
     // while searching for the exception handler.  Only the first level needs
     // to be reported.
-    if (UseOSErrorReporting && log_done) {
-      // We already handled the signal once, so reset signal handlers
-      // to their defaults and let OS handle it after the process will die
-      clear_signal_handlers();
-      return;
-    }
+    if (UseOSErrorReporting && log_done) return;
 
     // This is not the first error, see if it happened in a different thread
     // or in the same thread during error reporting.

src/hotspot/share/utilities/vmError.hpp

@@ -88,11 +88,9 @@ class VMError : public AllStatic {
 
  public:
 
-  // reset signal handlers to the default exception filter
-  // to handle recursive crashes
-  static void rearm_signal_handlers();
-
-  static void clear_signal_handlers();
+  // set signal handlers on Solaris/Linux or the default exception filter
+  // on Windows, to handle recursive crashes.
+  static void reset_signal_handlers();
 
   // handle -XX:+ShowMessageBoxOnError. buf is used to format the message string
   static void show_message_box(char* buf, int buflen);