stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7029509: nightly failures after static fields in Class

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Tom Rodriguez 2011-03-21 14:06:50 -07:00
parent 6e8a263a06
commit 31ac558f3d
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
View File

@ -3350,11 +3350,12 @@ void VM_RedefineClasses::increment_class_counter(instanceKlass *ik, TRAPS) {
for (Klass *subk = ik->subklass(); subk != NULL;
subk = subk->next_sibling()) {
klassOop sub = subk->as_klassOop();
instanceKlass *subik = (instanceKlass *)sub->klass_part();
// recursively do subclasses of the current subclass
increment_class_counter(subik, THREAD);
if (subk->oop_is_instance()) {
// Only update instanceKlasses
instanceKlass *subik = (instanceKlass*)subk;
// recursively do subclasses of the current subclass
increment_class_counter(subik, THREAD);
}
}
}

2
hotspot/src/share/vm/prims/jvmtiTagMap.cpp
View File

@ -2955,7 +2955,7 @@ inline bool VM_HeapWalkOperation::iterate_over_class(klassOop k) {
}
} else {
if (is_reporting_primitive_fields()) {
address addr = (address)k + field->field_offset();
address addr = (address)mirror + field->field_offset();
int slot = field->field_index();
if (!CallbackInvoker::report_primitive_static_field(mirror, slot, addr, type)) {
delete field_map;

2
hotspot/src/share/vm/services/heapDumper.cpp
View File

@ -832,7 +832,7 @@ void DumperSupport::dump_static_fields(DumpWriter* writer, klassOop k) {
// value
int offset = fld.offset();
address addr = (address)k + offset;
address addr = (address)ikh->java_mirror() + offset;
dump_field_value(writer, sig->byte_at(0), addr);
}