1.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp Thu Jan 27 13:42:28 2011 -0800
1.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Thu Jan 27 16:11:27 2011 -0800
1.3 @@ -39,7 +39,7 @@
1.4 #include "oops/methodDataOop.hpp"
1.5 #include "oops/objArrayKlass.hpp"
1.6 #include "oops/oop.inline.hpp"
1.7 -#include "oops/symbolOop.hpp"
1.8 +#include "oops/symbol.hpp"
1.9 #include "prims/jvmtiExport.hpp"
1.10 #include "prims/nativeLookup.hpp"
1.11 #include "runtime/biasedLocking.hpp"
1.12 @@ -295,7 +295,7 @@
1.13
1.14 IRT_ENTRY(void, InterpreterRuntime::create_exception(JavaThread* thread, char* name, char* message))
1.15 // lookup exception klass
1.16 - symbolHandle s = oopFactory::new_symbol_handle(name, CHECK);
1.17 + TempNewSymbol s = SymbolTable::new_symbol(name, CHECK);
1.18 if (ProfileTraps) {
1.19 if (s == vmSymbols::java_lang_ArithmeticException()) {
1.20 note_trap(thread, Deoptimization::Reason_div0_check, CHECK);
1.21 @@ -304,7 +304,7 @@
1.22 }
1.23 }
1.24 // create exception
1.25 - Handle exception = Exceptions::new_exception(thread, s(), message);
1.26 + Handle exception = Exceptions::new_exception(thread, s, message);
1.27 thread->set_vm_result(exception());
1.28 IRT_END
1.29
1.30 @@ -313,12 +313,12 @@
1.31 ResourceMark rm(thread);
1.32 const char* klass_name = Klass::cast(obj->klass())->external_name();
1.33 // lookup exception klass
1.34 - symbolHandle s = oopFactory::new_symbol_handle(name, CHECK);
1.35 + TempNewSymbol s = SymbolTable::new_symbol(name, CHECK);
1.36 if (ProfileTraps) {
1.37 note_trap(thread, Deoptimization::Reason_class_check, CHECK);
1.38 }
1.39 // create exception, with klass name as detail message
1.40 - Handle exception = Exceptions::new_exception(thread, s(), klass_name);
1.41 + Handle exception = Exceptions::new_exception(thread, s, klass_name);
1.42 thread->set_vm_result(exception());
1.43 IRT_END
1.44
1.45 @@ -326,13 +326,13 @@
1.46 IRT_ENTRY(void, InterpreterRuntime::throw_ArrayIndexOutOfBoundsException(JavaThread* thread, char* name, jint index))
1.47 char message[jintAsStringSize];
1.48 // lookup exception klass
1.49 - symbolHandle s = oopFactory::new_symbol_handle(name, CHECK);
1.50 + TempNewSymbol s = SymbolTable::new_symbol(name, CHECK);
1.51 if (ProfileTraps) {
1.52 note_trap(thread, Deoptimization::Reason_range_check, CHECK);
1.53 }
1.54 // create exception
1.55 sprintf(message, "%d", index);
1.56 - THROW_MSG(s(), message);
1.57 + THROW_MSG(s, message);
1.58 IRT_END
1.59
1.60 IRT_ENTRY(void, InterpreterRuntime::throw_ClassCastException(
1.61 @@ -673,7 +673,7 @@
1.62 ResourceMark rm(thread);
1.63 methodHandle m (thread, method(thread));
1.64 Bytecode_invoke call(m, bci(thread));
1.65 - symbolHandle signature (thread, call.signature());
1.66 + Symbol* signature = call.signature();
1.67 receiver = Handle(thread,
1.68 thread->last_frame().interpreter_callee_receiver(signature));
1.69 assert(Universe::heap()->is_in_reserved_or_null(receiver()),
1.70 @@ -797,7 +797,7 @@
1.71 if (!pool->cache()->secondary_entry_at(site_index)->is_f1_null())
1.72 return;
1.73
1.74 - symbolHandle call_site_name(THREAD, pool->name_ref_at(site_index));
1.75 + Symbol* call_site_name = pool->name_ref_at(site_index);
1.76
1.77 Handle call_site
1.78 = SystemDictionary::make_dynamic_call_site(bootm,
