8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180
Reviewed-by: shade, eosterlund
This commit is contained in:
parent
7e80c9897d
commit
aaa0a2a047
src/hotspot/share
@ -191,7 +191,9 @@ void OopMapSet::add_gc_map(int pc_offset, OopMap *map ) {
|
||||
}
|
||||
|
||||
static void add_derived_oop(oop* base, oop* derived, OopClosure* oop_fn) {
|
||||
#if COMPILER2_OR_JVMCI
|
||||
DerivedPointerTable::add(derived, base);
|
||||
#endif // COMPILER2_OR_JVMCI
|
||||
}
|
||||
|
||||
static void ignore_derived_oop(oop* base, oop* derived, OopClosure* oop_fn) {
|
||||
|
@ -1044,9 +1044,13 @@ void frame::oops_do(OopClosure* f, CodeBlobClosure* cf, const RegisterMap* map,
|
||||
}
|
||||
|
||||
void frame::oops_do(OopClosure* f, CodeBlobClosure* cf, const RegisterMap* map) const {
|
||||
#if COMPILER2_OR_JVMCI
|
||||
oops_do_internal(f, cf, map, true, DerivedPointerTable::is_active() ?
|
||||
DerivedPointerIterationMode::_with_table :
|
||||
DerivedPointerIterationMode::_ignore);
|
||||
#else
|
||||
oops_do_internal(f, cf, map, true, DerivedPointerIterationMode::_ignore);
|
||||
#endif
|
||||
}
|
||||
|
||||
void frame::oops_do_internal(OopClosure* f, CodeBlobClosure* cf, const RegisterMap* map,
|
||||
|
@ -211,7 +211,7 @@ void VMError::print_stack_trace(outputStream* st, JavaThread* jt,
|
||||
st->cr();
|
||||
|
||||
// Print the frames
|
||||
StackFrameStream sfs(jt);
|
||||
StackFrameStream sfs(jt, true /* update */, true /* process_frames */);
|
||||
for(int i = 0; !sfs.is_done(); sfs.next(), i++) {
|
||||
sfs.current()->zero_print_on_error(i, st, buf, buflen);
|
||||
st->cr();
|
||||
|
Loading…
x
Reference in New Issue
Block a user