--- a/src/hotspot/os/linux/os_linux.cpp	Wed Jun 05 10:49:09 2019 -0700
+++ b/src/hotspot/os/linux/os_linux.cpp	Wed Jun 05 14:01:01 2019 -0400
@@ -1461,8 +1461,15 @@
 }
 
 // Die immediately, no exit hook, no abort hook, no cleanup.
+// Dump a core file, if possible, for debugging.
 void os::die() {
-  ::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 {
+    ::abort();
+  }
 }
 
 // thread_id is kernel thread id (similar to Solaris LWP id)