8308396: Fix offset_of conversion warnings in runtime code

Reviewed-by: amitkumar, jsjolen, fparain
This commit is contained in:
Coleen Phillimore 2023-05-19 17:16:04 +00:00
parent a5343fa605
commit 265f40b4f7
85 changed files with 438 additions and 436 deletions

View file

@ -599,7 +599,7 @@ void TemplateInterpreterGenerator::lock_method() {
// add space for a monitor entry
__ str(Rstack_top, Address(FP, frame::interpreter_frame_monitor_block_top_offset * wordSize));
// set new monitor block top
__ str(R0, Address(Rstack_top, BasicObjectLock::obj_offset_in_bytes()));
__ str(R0, Address(Rstack_top, BasicObjectLock::obj_offset()));
// store object
__ mov(R1, Rstack_top); // monitor entry address
__ lock_object(R1);
@ -658,7 +658,7 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
__ ldr(Rtemp, Address(Rmethod, Method::const_offset()));
__ ldr(Rtemp, Address(Rtemp, ConstMethod::constants_offset()));
__ ldr(Rtemp, Address(Rtemp, ConstantPool::cache_offset_in_bytes()));
__ ldr(Rtemp, Address(Rtemp, ConstantPool::cache_offset()));
__ push(Rtemp); // set constant pool cache
__ sub(Rtemp, Rlocals, FP);
__ logical_shift_right(Rtemp, Rtemp, Interpreter::logStackElementSize); // Rtemp = Rlocals - fp();
@ -1054,7 +1054,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
// Zero handles and last_java_sp
__ reset_last_Java_frame(Rtemp);
__ ldr(R3, Address(Rthread, JavaThread::active_handles_offset()));
__ str_32(__ zero_register(Rtemp), Address(R3, JNIHandleBlock::top_offset_in_bytes()));
__ str_32(__ zero_register(Rtemp), Address(R3, JNIHandleBlock::top_offset()));
if (CheckJNICalls) {
__ str(__ zero_register(Rtemp), Address(Rthread, JavaThread::pending_jni_exception_check_fn_offset()));
}