Skip to content

Commit aaa0a2a

Browse files
committed
8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180
Reviewed-by: shade, eosterlund
1 parent 7e80c98 commit aaa0a2a

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/hotspot/share/compiler/oopMap.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ void OopMapSet::add_gc_map(int pc_offset, OopMap *map ) {
191191
}
192192

193193
static void add_derived_oop(oop* base, oop* derived, OopClosure* oop_fn) {
194+
#if COMPILER2_OR_JVMCI
194195
DerivedPointerTable::add(derived, base);
196+
#endif // COMPILER2_OR_JVMCI
195197
}
196198

197199
static void ignore_derived_oop(oop* base, oop* derived, OopClosure* oop_fn) {

src/hotspot/share/runtime/frame.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,9 +1044,13 @@ void frame::oops_do(OopClosure* f, CodeBlobClosure* cf, const RegisterMap* map,
10441044
}
10451045

10461046
void frame::oops_do(OopClosure* f, CodeBlobClosure* cf, const RegisterMap* map) const {
1047+
#if COMPILER2_OR_JVMCI
10471048
oops_do_internal(f, cf, map, true, DerivedPointerTable::is_active() ?
10481049
DerivedPointerIterationMode::_with_table :
10491050
DerivedPointerIterationMode::_ignore);
1051+
#else
1052+
oops_do_internal(f, cf, map, true, DerivedPointerIterationMode::_ignore);
1053+
#endif
10501054
}
10511055

10521056
void frame::oops_do_internal(OopClosure* f, CodeBlobClosure* cf, const RegisterMap* map,

src/hotspot/share/utilities/vmError.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ void VMError::print_stack_trace(outputStream* st, JavaThread* jt,
211211
st->cr();
212212

213213
// Print the frames
214-
StackFrameStream sfs(jt);
214+
StackFrameStream sfs(jt, true /* update */, true /* process_frames */);
215215
for(int i = 0; !sfs.is_done(); sfs.next(), i++) {
216216
sfs.current()->zero_print_on_error(i, st, buf, buflen);
217217
st->cr();

0 commit comments

Comments
 (0)