From d9abf606d9a3156574ca87846e7580a4092c815b Mon Sep 17 00:00:00 2001
From: Monica Beckwith <monica.beckwith@microsoft.com>
Date: Mon, 3 Aug 2020 00:16:49 -0400
Subject: [PATCH] 8250824: AArch64: follow up for JDK-8248414
The original change missed to update an assert.
Co-authored-by: Ludovic Henry <luhenry@microsoft.com>
Co-authored-by: Bernhard Urban-Forster <beurba@microsoft.com>
Reviewed-by: dholmes
---
src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index bbc13589e33..2f4947c0cb6 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -1507,7 +1507,7 @@ void MacroAssembler::movptr(Register r, uintptr_t imm64) {
block_comment(buffer);
}
#endif
- assert(imm64 < (1ul << 48), "48-bit overflow in address constant");
+ assert(imm64 < (1ull << 48), "48-bit overflow in address constant");
movz(r, imm64 & 0xffff);
imm64 >>= 16;
movk(r, imm64 & 0xffff, 16);