1.1 --- a/src/share/vm/utilities/exceptions.hpp Thu Jan 27 13:42:28 2011 -0800
1.2 +++ b/src/share/vm/utilities/exceptions.hpp Thu Jan 27 16:11:27 2011 -0800
1.3 @@ -50,8 +50,7 @@
1.4
1.5 class Thread;
1.6 class Handle;
1.7 -class symbolHandle;
1.8 -class symbolOopDesc;
1.9 +class Symbol;
1.10 class JavaCallArguments;
1.11
1.12 // The ThreadShadow class is a helper class to access the _pending_exception
1.13 @@ -100,7 +99,7 @@
1.14
1.15 class Exceptions {
1.16 static bool special_exception(Thread *thread, const char* file, int line, Handle exception);
1.17 - static bool special_exception(Thread* thread, const char* file, int line, symbolHandle name, const char* message);
1.18 + static bool special_exception(Thread* thread, const char* file, int line, Symbol* name, const char* message);
1.19 public:
1.20 // this enum is defined to indicate whether it is safe to
1.21 // ignore the encoding scheme of the original message string.
1.22 @@ -112,38 +111,36 @@
1.23 static void _throw_oop(Thread* thread, const char* file, int line, oop exception);
1.24 static void _throw(Thread* thread, const char* file, int line, Handle exception, const char* msg = NULL);
1.25 static void _throw_msg(Thread* thread, const char* file, int line,
1.26 - symbolHandle name, const char* message, Handle loader,
1.27 + Symbol* name, const char* message, Handle loader,
1.28 Handle protection_domain);
1.29 static void _throw_msg(Thread* thread, const char* file, int line,
1.30 - symbolOop name, const char* message);
1.31 - static void _throw_msg(Thread* thread, const char* file, int line,
1.32 - symbolHandle name, const char* message);
1.33 + Symbol* name, const char* message);
1.34 static void _throw_args(Thread* thread, const char* file, int line,
1.35 - symbolHandle name, symbolHandle signature,
1.36 + Symbol* name, Symbol* signature,
1.37 JavaCallArguments* args);
1.38 static void _throw_msg_cause(Thread* thread, const char* file,
1.39 - int line, symbolHandle h_name, const char* message,
1.40 + int line, Symbol* h_name, const char* message,
1.41 Handle h_cause, Handle h_loader, Handle h_protection_domain);
1.42 static void _throw_msg_cause(Thread* thread, const char* file, int line,
1.43 - symbolHandle name, const char* message, Handle cause);
1.44 + Symbol* name, const char* message, Handle cause);
1.45
1.46 // There is no THROW... macro for this method. Caller should remember
1.47 // to do a return after calling it.
1.48 - static void fthrow(Thread* thread, const char* file, int line, symbolHandle name,
1.49 + static void fthrow(Thread* thread, const char* file, int line, Symbol* name,
1.50 const char* format, ...);
1.51
1.52 // Create and initialize a new exception
1.53 - static Handle new_exception(Thread* thread, symbolHandle name,
1.54 - symbolHandle signature, JavaCallArguments* args,
1.55 + static Handle new_exception(Thread* thread, Symbol* name,
1.56 + Symbol* signature, JavaCallArguments* args,
1.57 Handle cause, Handle loader,
1.58 Handle protection_domain);
1.59
1.60 - static Handle new_exception(Thread* thread, symbolHandle name,
1.61 + static Handle new_exception(Thread* thread, Symbol* name,
1.62 const char* message, Handle cause, Handle loader,
1.63 Handle protection_domain,
1.64 ExceptionMsgToUtf8Mode to_utf8_safe = safe_to_utf8);
1.65
1.66 - static Handle new_exception(Thread* thread, symbolOop name,
1.67 + static Handle new_exception(Thread* thread, Symbol* name,
1.68 const char* message,
1.69 ExceptionMsgToUtf8Mode to_utf8_safe = safe_to_utf8);
1.70
