--- a/src/hotspot/share/runtime/globals.hpp	Tue Nov 20 22:37:34 2018 +0100
+++ b/src/hotspot/share/runtime/globals.hpp	Tue Nov 20 22:59:27 2018 +0100
@@ -498,8 +498,8 @@
           "Time out and warn or fail after SafepointTimeoutDelay "          \
           "milliseconds if failed to reach safepoint")                      \
                                                                             \
-  develop(bool, DieOnSafepointTimeout, false,                               \
-          "Die upon failure to reach safepoint (see SafepointTimeout)")     \
+  diagnostic(bool, AbortVMOnSafepointTimeout, false,                        \
+          "Abort upon failure to reach safepoint (see SafepointTimeout)")   \
                                                                             \
   /* 50 retries * (5 * current_retry_count) millis = ~6.375 seconds */      \
   /* typically, at most a few retries are needed                    */      \

--- a/src/hotspot/share/runtime/safepoint.cpp	Tue Nov 20 22:37:34 2018 +0100
+++ b/src/hotspot/share/runtime/safepoint.cpp	Tue Nov 20 22:59:27 2018 +0100
@@ -978,9 +978,9 @@
     }
   }
 
-  // To debug the long safepoint, specify both DieOnSafepointTimeout &
+  // To debug the long safepoint, specify both AbortVMOnSafepointTimeout &
   // ShowMessageBoxOnError.
-  if (DieOnSafepointTimeout) {
+  if (AbortVMOnSafepointTimeout) {
     fatal("Safepoint sync time longer than " INTX_FORMAT "ms detected when executing %s.",
           SafepointTimeoutDelay, VMThread::vm_safepoint_description());
   }