1.1 --- a/src/share/vm/prims/jvmtiImpl.cpp Thu Jan 27 13:42:28 2011 -0800
1.2 +++ b/src/share/vm/prims/jvmtiImpl.cpp Thu Jan 27 16:11:27 2011 -0800
1.3 @@ -285,8 +285,8 @@
1.4 // not saved in the PreviousVersionInfo.
1.5 Thread *thread = Thread::current();
1.6 instanceKlassHandle ikh = instanceKlassHandle(thread, _method->method_holder());
1.7 - symbolOop m_name = _method->name();
1.8 - symbolOop m_signature = _method->signature();
1.9 + Symbol* m_name = _method->name();
1.10 + Symbol* m_signature = _method->signature();
1.11
1.12 {
1.13 ResourceMark rm(thread);
1.14 @@ -628,22 +628,22 @@
1.15 ty_sign++;
1.16 len -= 2;
1.17 }
1.18 - symbolHandle ty_sym = oopFactory::new_symbol_handle(ty_sign, len, thread);
1.19 - if (klass->name() == ty_sym()) {
1.20 + TempNewSymbol ty_sym = SymbolTable::new_symbol(ty_sign, len, thread);
1.21 + if (klass->name() == ty_sym) {
1.22 return true;
1.23 }
1.24 // Compare primary supers
1.25 int super_depth = klass->super_depth();
1.26 int idx;
1.27 for (idx = 0; idx < super_depth; idx++) {
1.28 - if (Klass::cast(klass->primary_super_of_depth(idx))->name() == ty_sym()) {
1.29 + if (Klass::cast(klass->primary_super_of_depth(idx))->name() == ty_sym) {
1.30 return true;
1.31 }
1.32 }
1.33 // Compare secondary supers
1.34 objArrayOop sec_supers = klass->secondary_supers();
1.35 for (idx = 0; idx < sec_supers->length(); idx++) {
1.36 - if (Klass::cast((klassOop) sec_supers->obj_at(idx))->name() == ty_sym()) {
1.37 + if (Klass::cast((klassOop) sec_supers->obj_at(idx))->name() == ty_sym) {
1.38 return true;
1.39 }
1.40 }
1.41 @@ -690,7 +690,7 @@
1.42 _result = JVMTI_ERROR_INVALID_SLOT;
1.43 return false; // Incorrect slot index
1.44 }
1.45 - symbolOop sign_sym = method_oop->constants()->symbol_at(signature_idx);
1.46 + Symbol* sign_sym = method_oop->constants()->symbol_at(signature_idx);
1.47 const char* signature = (const char *) sign_sym->as_utf8();
1.48 BasicType slot_type = char2type(signature[0]);
1.49
