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

8317581: [s390x] Multiple test failure with LockingMode=2

Browse Source 
Reviewed-by: stuefe, lucy
This commit is contained in:
Amit Kumar 2023-10-12 03:33:30 +00:00
parent 387896fb34
commit 839cb19ec2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/cpu/s390/assembler_s390.hpp
View File

@ -140,7 +140,8 @@ class RelAddr {
if ((target == nullptr) || (target == pc)) { if ((target == nullptr) || (target == pc)) {
return 0; // Yet unknown branch destination. return 0; // Yet unknown branch destination.
} else { } else {
guarantee(is_in_range_of_RelAddr(target, pc, shortForm), "target not within reach"); guarantee(is_in_range_of_RelAddr(target, pc, shortForm),
"target not within reach at " INTPTR_FORMAT ", distance = " INTX_FORMAT, p2i(pc), (target - pc) );
return (int)((target - pc)>>1); return (int)((target - pc)>>1);
} }
} }

4
src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
View File

@ -101,7 +101,7 @@ void C1_MacroAssembler::lock_object(Register Rmark, Register Roop, Register Rbox
if (DiagnoseSyncOnValueBasedClasses != 0) { if (DiagnoseSyncOnValueBasedClasses != 0) {
load_klass(tmp, Roop); load_klass(tmp, Roop);
testbit(Address(tmp, Klass::access_flags_offset()), exact_log2(JVM_ACC_IS_VALUE_BASED_CLASS)); testbit(Address(tmp, Klass::access_flags_offset()), exact_log2(JVM_ACC_IS_VALUE_BASED_CLASS));
z_btrue(slow_case); branch_optimized(Assembler::bcondAllOne, slow_case);
} }
assert(LockingMode != LM_MONITOR, "LM_MONITOR is already handled, by emit_lock()"); assert(LockingMode != LM_MONITOR, "LM_MONITOR is already handled, by emit_lock()");
@ -170,7 +170,7 @@ void C1_MacroAssembler::unlock_object(Register Rmark, Register Roop, Register Rb
z_lg(Rmark, Address(Roop, hdr_offset)); z_lg(Rmark, Address(Roop, hdr_offset));
z_lgr(tmp, Rmark); z_lgr(tmp, Rmark);
z_nill(tmp, markWord::monitor_value); z_nill(tmp, markWord::monitor_value);
z_brnz(slow_case); branch_optimized(Assembler::bcondNotZero, slow_case);
lightweight_unlock(Roop, Rmark, tmp, slow_case); lightweight_unlock(Roop, Rmark, tmp, slow_case);
} else if (LockingMode == LM_LEGACY) { } else if (LockingMode == LM_LEGACY) {
// Test if object header is pointing to the displaced header, and if so, restore // Test if object header is pointing to the displaced header, and if so, restore