Skip to content

Commit 1dfe09d

Browse files
committed
[Backport] 8369506: Make AArch64 verify_field_offset compatible with COH
Use oopDesc::base_offset_in_bytes() so the debug check follows the actual object header layout when Compact Object Headers is enabled. Fixes #991 Backport-of: 18fd04770294e27011bd576b5ea5fe43fa03e5e3
1 parent a98ef52 commit 1dfe09d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1879,7 +1879,7 @@ void InterpreterMacroAssembler::profile_parameters_type(Register mdp, Register t
18791879
void InterpreterMacroAssembler::verify_field_offset(Register reg) {
18801880
// Verify the field offset is not in the header, implicitly checks for 0
18811881
Label L;
1882-
subs(zr, reg, static_cast<int>(sizeof(markOop) + (UseCompressedClassPointers ? sizeof(narrowKlass) : sizeof(Klass*))));
1882+
subs(zr, reg, oopDesc::base_offset_in_bytes());
18831883
br(Assembler::GE, L);
18841884
stop("bad field offset");
18851885
bind(L);

0 commit comments

Comments
 (0)