8273939: Backport of 8248414 to JDK11 breaks MacroAssembler::adrp

Vladimir Kempik · Vladimir Kempik · commit f336c729e35b · 2021-09-18T21:10:28.000Z
Reviewed-by: mdoerr
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -4242,6 +4242,7 @@ void MacroAssembler::adrp(Register reg1, const Address &dest, uint64_t &byte_off
     uint64_t adrp_target
       = (target & 0xffffffffULL) | ((uint64_t)pc() & 0xffff00000000ULL);
 
+    _adrp(reg1, (address)adrp_target);
     movk(reg1, target >> 32, 32);
   }
   byte_offset = (uint64_t)dest.target() & 0xfff;

Original file line number	Diff line number	Diff line change
`@@ -4242,6 +4242,7 @@ void MacroAssembler::adrp(Register reg1, const Address &dest, uint64_t &byte_off`
`4242`	`4242`	`uint64_t adrp_target`
`4243`	`4243`	`= (target & 0xffffffffULL) \| ((uint64_t)pc() & 0xffff00000000ULL);`
`4244`	`4244`
	`4245`	`+ _adrp(reg1, (address)adrp_target);`
`4245`	`4246`	`movk(reg1, target >> 32, 32);`
`4246`	`4247`	`}`
`4247`	`4248`	`byte_offset = (uint64_t)dest.target() & 0xfff;`