Automatic merge of jdk:master into master

openjdk · Nov 3, 2020 · 1280739 · 1280739
2 parents 6cafb1b + 9a36747
commit 1280739
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
@@ -1321,19 +1321,6 @@ void VMError::report_and_die(Thread* thread, unsigned int sig, address pc, void*
   report_and_die(thread, sig, pc, siginfo, context, "%s", "");
 }
 
-void VMError::report_and_die(const char* message, const char* detail_fmt, ...)
-{
-  va_list detail_args;
-  va_start(detail_args, detail_fmt);
-  report_and_die(INTERNAL_ERROR, message, detail_fmt, detail_args, NULL, NULL, NULL, NULL, NULL, 0, 0);
-  va_end(detail_args);
-}
-
-void VMError::report_and_die(const char* message)
-{
-  report_and_die(message, "%s", "");
-}
-
 void VMError::report_and_die(Thread* thread, void* context, const char* filename, int lineno, const char* message,
                              const char* detail_fmt, va_list detail_args)
 {

diff --git a/src/hotspot/share/utilities/vmError.hpp b/src/hotspot/share/utilities/vmError.hpp
@@ -118,7 +118,6 @@ class VMError : public AllStatic {
 
   static void report_and_die(Thread* thread, unsigned int sig, address pc, void* siginfo,
                              void* context, const char* detail_fmt, ...) ATTRIBUTE_PRINTF(6, 7);
-  static void report_and_die(const char* message, const char* detail_fmt, ...) ATTRIBUTE_PRINTF(2, 3);
 
   // Timeout handling.
   // Hook functions for platform dependend functionality:
@@ -161,8 +160,6 @@ class VMError : public AllStatic {
                              VMErrorType vm_err_type, const char* detail_fmt,
                              va_list detail_args) ATTRIBUTE_PRINTF(6, 0);
 
-  static void report_and_die(const char* message);
-
   // reporting OutOfMemoryError
   static void report_java_out_of_memory(const char* message);