archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6957004: MethodComparator uses the wrong CP index accessor

Browse source 
Change two uses of get_index_u2 to get_index_u2_cpcache; also tweak some debugging print functions

Reviewed-by: kvn
This commit is contained in:
John R Rose 2010-05-28 16:23:51 -07:00
parent 4da8658b14
commit 49cbc41c82
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hotspot/src/share/vm/oops/constantPoolKlass.cpp
View file

@ -310,15 +310,12 @@ void constantPoolKlass::oop_print_on(oop obj, outputStream* st) {
Klass::oop_print_on(obj, st); Klass::oop_print_on(obj, st);
constantPoolOop cp = constantPoolOop(obj); constantPoolOop cp = constantPoolOop(obj);
if (cp->flags() != 0) { if (cp->flags() != 0) {
st->print(" - flags : 0x%x", cp->flags()); st->print(" - flags: 0x%x", cp->flags());
if (cp->has_pseudo_string()) st->print(" has_pseudo_string"); if (cp->has_pseudo_string()) st->print(" has_pseudo_string");
if (cp->has_invokedynamic()) st->print(" has_invokedynamic"); if (cp->has_invokedynamic()) st->print(" has_invokedynamic");
st->cr(); st->cr();
} }
st->print_cr(" - cache: " INTPTR_FORMAT, cp->cache());
// Temp. remove cache so we can do lookups with original indicies.
constantPoolCacheHandle cache (THREAD, cp->cache());
cp->set_cache(NULL);
for (int index = 1; index < cp->length(); index++) { // Index 0 is unused for (int index = 1; index < cp->length(); index++) { // Index 0 is unused
st->print(" - %3d : ", index); st->print(" - %3d : ", index);
@ -334,8 +331,8 @@ void constantPoolKlass::oop_print_on(oop obj, outputStream* st) {
case JVM_CONSTANT_Fieldref : case JVM_CONSTANT_Fieldref :
case JVM_CONSTANT_Methodref : case JVM_CONSTANT_Methodref :
case JVM_CONSTANT_InterfaceMethodref : case JVM_CONSTANT_InterfaceMethodref :
st->print("klass_index=%d", cp->klass_ref_index_at(index)); st->print("klass_index=%d", cp->uncached_klass_ref_index_at(index));
st->print(" name_and_type_index=%d", cp->name_and_type_ref_index_at(index)); st->print(" name_and_type_index=%d", cp->uncached_name_and_type_ref_index_at(index));
break; break;
case JVM_CONSTANT_UnresolvedString : case JVM_CONSTANT_UnresolvedString :
case JVM_CONSTANT_String : case JVM_CONSTANT_String :
@ -382,9 +379,6 @@ void constantPoolKlass::oop_print_on(oop obj, outputStream* st) {
st->cr(); st->cr();
} }
st->cr(); st->cr();
// Restore cache
cp->set_cache(cache());
} }
#endif #endif
@ -398,6 +392,9 @@ void constantPoolKlass::oop_print_value_on(oop obj, outputStream* st) {
cp->print_address_on(st); cp->print_address_on(st);
st->print(" for "); st->print(" for ");
cp->pool_holder()->print_value_on(st); cp->pool_holder()->print_value_on(st);
if (cp->cache() != NULL) {
st->print(" cache=" PTR_FORMAT, cp->cache());
}
} }
const char* constantPoolKlass::internal_name() const { const char* constantPoolKlass::internal_name() const {

2
hotspot/src/share/vm/oops/methodKlass.cpp
View file

@ -237,7 +237,7 @@ void methodKlass::oop_print_on(oop obj, outputStream* st) {
Klass::oop_print_on(obj, st); Klass::oop_print_on(obj, st);
methodOop m = methodOop(obj); methodOop m = methodOop(obj);
// get the effect of PrintOopAddress, always, for methods: // get the effect of PrintOopAddress, always, for methods:
st->print (" - this oop: "INTPTR_FORMAT, (intptr_t)m); st->print_cr(" - this oop: "INTPTR_FORMAT, (intptr_t)m);
st->print (" - method holder: "); m->method_holder()->print_value_on(st); st->cr(); st->print (" - method holder: "); m->method_holder()->print_value_on(st); st->cr();
st->print (" - constants: "INTPTR_FORMAT" ", (address)m->constants()); st->print (" - constants: "INTPTR_FORMAT" ", (address)m->constants());
m->constants()->print_value_on(st); st->cr(); m->constants()->print_value_on(st); st->cr();

4
hotspot/src/share/vm/prims/methodComparator.cpp
View file

@ -149,8 +149,8 @@ bool MethodComparator::args_same(Bytecodes::Code c_old, Bytecodes::Code c_new) {
case Bytecodes::_invokestatic : // fall through case Bytecodes::_invokestatic : // fall through
case Bytecodes::_invokedynamic : // fall through case Bytecodes::_invokedynamic : // fall through
case Bytecodes::_invokeinterface : { case Bytecodes::_invokeinterface : {
u2 cpci_old = _s_old->has_index_u4() ? _s_old->get_index_u4() : _s_old->get_index_u2(); int cpci_old = _s_old->has_index_u4() ? _s_old->get_index_u4() : _s_old->get_index_u2_cpcache();
u2 cpci_new = _s_new->has_index_u4() ? _s_new->get_index_u4() : _s_new->get_index_u2(); int cpci_new = _s_new->has_index_u4() ? _s_new->get_index_u4() : _s_new->get_index_u2_cpcache();
// Check if the names of classes, field/method names and signatures at these indexes // Check if the names of classes, field/method names and signatures at these indexes
// are the same. Indices which are really into constantpool cache (rather than constant // are the same. Indices which are really into constantpool cache (rather than constant
// pool itself) are accepted by the constantpool query routines below. // pool itself) are accepted by the constantpool query routines below.