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

8167299: -XX:+PrintRelocations crashes the VM

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Volker Simonis 2016-10-06 18:04:11 +02:00
parent b82dbd43b5
commit 07da91668a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hotspot/src/share/vm/code/relocInfo.cpp
View File

@ -743,7 +743,9 @@ address virtual_call_Relocation::cached_value() {
} }
Method* virtual_call_Relocation::method_value() { Method* virtual_call_Relocation::method_value() {
Metadata* m = code()->metadata_at(_method_index); CompiledMethod* cm = code();
if (cm == NULL) return (Method*)NULL;
Metadata* m = cm->metadata_at(_method_index);
assert(m != NULL || _method_index == 0, "should be non-null for non-zero index"); assert(m != NULL || _method_index == 0, "should be non-null for non-zero index");
assert(m == NULL || m->is_method(), "not a method"); assert(m == NULL || m->is_method(), "not a method");
return (Method*)m; return (Method*)m;
@ -769,7 +771,9 @@ void opt_virtual_call_Relocation::unpack_data() {
} }
Method* opt_virtual_call_Relocation::method_value() { Method* opt_virtual_call_Relocation::method_value() {
Metadata* m = code()->metadata_at(_method_index); CompiledMethod* cm = code();
if (cm == NULL) return (Method*)NULL;
Metadata* m = cm->metadata_at(_method_index);
assert(m != NULL || _method_index == 0, "should be non-null for non-zero index"); assert(m != NULL || _method_index == 0, "should be non-null for non-zero index");
assert(m == NULL || m->is_method(), "not a method"); assert(m == NULL || m->is_method(), "not a method");
return (Method*)m; return (Method*)m;
@ -800,7 +804,9 @@ address opt_virtual_call_Relocation::static_stub() {
} }
Method* static_call_Relocation::method_value() { Method* static_call_Relocation::method_value() {
Metadata* m = code()->metadata_at(_method_index); CompiledMethod* cm = code();
if (cm == NULL) return (Method*)NULL;
Metadata* m = cm->metadata_at(_method_index);
assert(m != NULL || _method_index == 0, "should be non-null for non-zero index"); assert(m != NULL || _method_index == 0, "should be non-null for non-zero index");
assert(m == NULL || m->is_method(), "not a method"); assert(m == NULL || m->is_method(), "not a method");
return (Method*)m; return (Method*)m;
@ -970,8 +976,10 @@ void RelocIterator::print_current() {
// work even during GC or other inconvenient times. // work even during GC or other inconvenient times.
if (WizardMode && oop_value != NULL) { if (WizardMode && oop_value != NULL) {
tty->print("oop_value=" INTPTR_FORMAT ": ", p2i(oop_value)); tty->print("oop_value=" INTPTR_FORMAT ": ", p2i(oop_value));
if (oop_value->is_oop()) {
oop_value->print_value_on(tty); oop_value->print_value_on(tty);
} }
}
break; break;
} }
case relocInfo::metadata_type: case relocInfo::metadata_type: