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

8342701: [PPC64] TestOSRLotsOfLocals.java crashes

Browse Source 
Reviewed-by: lucy, rrich
This commit is contained in:
Martin Doerr 2024-10-22 13:16:27 +00:00
parent 264d7014a1
commit 3bba0f3dc8
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
View File

@ -133,9 +133,20 @@ void LIR_Assembler::osr_entry() {
// copied into place by code emitted in the IR. // copied into place by code emitted in the IR.
Register OSR_buf = osrBufferPointer()->as_register(); Register OSR_buf = osrBufferPointer()->as_register();
{ assert(frame::interpreter_frame_monitor_size() == BasicObjectLock::size(), "adjust code below"); {
int monitor_offset = BytesPerWord * method()->max_locals() + assert(frame::interpreter_frame_monitor_size() == BasicObjectLock::size(), "adjust code below");
(2 * BytesPerWord) * (number_of_locks - 1);
const int locals_space = BytesPerWord * method()->max_locals();
int monitor_offset = locals_space + (2 * BytesPerWord) * (number_of_locks - 1);
bool use_OSR_bias = false;
if (!Assembler::is_simm16(monitor_offset + BytesPerWord) && number_of_locks > 0) {
// Offsets too large for ld instructions. Use bias.
__ add_const_optimized(OSR_buf, OSR_buf, locals_space);
monitor_offset -= locals_space;
use_OSR_bias = true;
}
// SharedRuntime::OSR_migration_begin() packs BasicObjectLocks in // SharedRuntime::OSR_migration_begin() packs BasicObjectLocks in
// the OSR buffer using 2 word entries: first the lock and then // the OSR buffer using 2 word entries: first the lock and then
// the oop. // the oop.
@ -161,6 +172,11 @@ void LIR_Assembler::osr_entry() {
__ ld(R0, slot_offset + 1*BytesPerWord, OSR_buf); __ ld(R0, slot_offset + 1*BytesPerWord, OSR_buf);
__ std(R0, mo.disp(), mo.base()); __ std(R0, mo.disp(), mo.base());
} }
if (use_OSR_bias) {
// Restore.
__ sub_const_optimized(OSR_buf, OSR_buf, locals_space);
}
} }
} }