8250824: AArch64: follow up for JDK-8248414

mo-beck · luhenry · lewurm · David Holmes · commit d9abf606d9a3 · 2020-08-03T00:16:49.000-04:00
The original change missed to update an assert.

Co-authored-by: Ludovic Henry &lt;luhenry@microsoft.com&gt;
Co-authored-by: Bernhard Urban-Forster &lt;beurba@microsoft.com&gt;
Reviewed-by: dholmes
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1507,7 +1507,7 @@ void MacroAssembler::movptr(Register r, uintptr_t imm64) {`
`1507`	`1507`	`block_comment(buffer);`
`1508`	`1508`	`}`
`1509`	`1509`	`#endif`
`1510`		`- assert(imm64 < (1ul << 48), "48-bit overflow in address constant");`
	`1510`	`+ assert(imm64 < (1ull << 48), "48-bit overflow in address constant");`
`1511`	`1511`	`movz(r, imm64 & 0xffff);`
`1512`	`1512`	`imm64 >>= 16;`
`1513`	`1513`	`movk(r, imm64 & 0xffff, 16);`