--- a/src/hotspot/os/bsd/os_bsd.cpp	Wed Jun 05 10:49:09 2019 -0700
+++ b/src/hotspot/os/bsd/os_bsd.cpp	Wed Jun 05 14:01:01 2019 -0400
@@ -1073,9 +1073,16 @@
 }
 
 // Die immediately, no exit hook, no abort hook, no cleanup.
+// Dump a core file, if possible, for debugging.
 void os::die() {
-  // _exit() on BsdThreads only kills current thread
-  ::abort();
+  if (TestUnresponsiveErrorHandler && !CreateCoredumpOnCrash) {
+    // For TimeoutInErrorHandlingTest.java, we just kill the VM
+    // and don't take the time to generate a core file.
+    os::signal_raise(SIGKILL);
+  } else {
+    // _exit() on BsdThreads only kills current thread
+    ::abort();
+  }
 }
 
 // Information of current thread in variety of formats