changeset 55625:964186594f5f

8221725: AArch64 build failures after JDK-8221408 (Windows 32bit build build errors/warnings in hotspot) Reviewed-by: dholmes, stuefe
author shade
date Mon, 01 Apr 2019 10:02:07 +0200
parents 4f9772f4403d
children e0603b4537c3
files src/hotspot/cpu/aarch64/aarch64.ad
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/aarch64.ad	Mon Apr 01 12:44:23 2019 +0530
+++ b/src/hotspot/cpu/aarch64/aarch64.ad	Mon Apr 01 10:02:07 2019 +0200
@@ -3445,7 +3445,7 @@
     // markOop of object (disp_hdr) with the stack pointer.
     __ mov(rscratch1, sp);
     __ sub(disp_hdr, disp_hdr, rscratch1);
-    __ mov(tmp, (address) (~(os::vm_page_size()-1) | markOopDesc::lock_mask_in_place));
+    __ mov(tmp, (address) (~(os::vm_page_size()-1) | (uintptr_t)markOopDesc::lock_mask_in_place));
     // If condition is true we are cont and hence we can store 0 as the
     // displaced header in the box, which indicates that it is a recursive lock.
     __ ands(tmp/*==0?*/, disp_hdr, tmp);   // Sets flags for result