# HG changeset patch # User shade # Date 1611049500 -3600 # Node ID aa3d863d3ab52e1ac92d5b54b196b7889c3702b1 # Parent 2025476613c2874701ffae7c7b4756b90cfbd4e2 8259568: PPC64 builds broken after JDK-8221408 8u backport Reviewed-by: mdoerr, aph diff -r 2025476613c2 -r aa3d863d3ab5 src/cpu/ppc/vm/interp_masm_ppc_64.cpp --- a/src/cpu/ppc/vm/interp_masm_ppc_64.cpp Tue Jan 12 15:16:43 2021 +0100 +++ b/src/cpu/ppc/vm/interp_masm_ppc_64.cpp Tue Jan 19 10:45:00 2021 +0100 @@ -908,9 +908,7 @@ sub(current_header, current_header, R1_SP); assert(os::vm_page_size() > 0xfff, "page size too small - change the constant"); - load_const_optimized(tmp, - (address) (~(os::vm_page_size()-1) | - markOopDesc::lock_mask_in_place)); + load_const_optimized(tmp, ~(os::vm_page_size()-1) | markOopDesc::lock_mask_in_place); and_(R0/*==0?*/, current_header, tmp); // If condition is true we are done and hence we can store 0 in the displaced diff -r 2025476613c2 -r aa3d863d3ab5 src/cpu/ppc/vm/macroAssembler_ppc.cpp --- a/src/cpu/ppc/vm/macroAssembler_ppc.cpp Tue Jan 12 15:16:43 2021 +0100 +++ b/src/cpu/ppc/vm/macroAssembler_ppc.cpp Tue Jan 19 10:45:00 2021 +0100 @@ -2046,8 +2046,7 @@ // Check if the owner is self by comparing the value in the markOop of object // (current_header) with the stack pointer. sub(current_header, current_header, R1_SP); - load_const_optimized(temp, (address) (~(os::vm_page_size()-1) | - markOopDesc::lock_mask_in_place)); + load_const_optimized(temp, ~(os::vm_page_size()-1) | markOopDesc::lock_mask_in_place); and_(R0/*==0?*/, current_header, temp); // If condition is true we are cont and hence we can store 0 as the