src/hotspot/share/utilities/exceptions.hpp

*** 180,10 ***
--- 180,12 ---
                                const char* message,
                                ExceptionMsgToUtf8Mode to_utf8_safe = safe_to_utf8);
  
    static void throw_stack_overflow_exception(JavaThread* thread, const char* file, int line, const methodHandle& method);
  
+   static void wrap_exception_in_internal_error(const char* message, JavaThread* thread);
+ 
    static void wrap_dynamic_exception(bool is_indy, JavaThread* thread);
  
    // Exception counting of interesting exceptions that may have caused a
    // problem for the JVM, for reporting in the hs_err file.
    static void increment_stack_overflow_errors();

*** 266,10 ***
--- 268,12 ---
  // The THROW... macros should be used to throw an exception. They require a THREAD variable to be
  // visible within the scope containing the THROW. Usually this is achieved by declaring the function
  // with a TRAPS argument.
  
  #define THREAD_AND_LOCATION                      THREAD, __FILE__, __LINE__
+ #define THREAD_AND_LOCATION_DECL                 TRAPS, const char* file, int line
+ #define THREAD_AND_LOCATION_ARGS                 THREAD, file, line
  
  #define THROW_OOP(e)                                \
    { Exceptions::_throw_oop(THREAD_AND_LOCATION, e);                             return;  }
  
  #define THROW_HANDLE(e)                                \