--- a/hotspot/src/share/vm/utilities/exceptions.hpp	Wed Oct 14 13:30:47 2015 -0400
+++ b/hotspot/src/share/vm/utilities/exceptions.hpp	Wed Oct 14 15:36:41 2015 -0700
@@ -174,8 +174,9 @@
   static void print_exception_counts_on_error(outputStream* st);
 
   // for AbortVMOnException flag
-  NOT_PRODUCT(static void debug_check_abort(Handle exception, const char* message = NULL);)
-  NOT_PRODUCT(static void debug_check_abort(const char *value_string, const char* message = NULL);)
+  static void debug_check_abort(Handle exception, const char* message = NULL);
+  static void debug_check_abort_helper(Handle exception, const char* message = NULL);
+  static void debug_check_abort(const char *value_string, const char* message = NULL);
 };