--- old/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp	2019-11-12 10:07:53.136144575 +0100
+++ new/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp	2019-11-12 10:07:52.936143051 +0100
@@ -144,7 +144,7 @@
   const size_t max_address_offset_bits = 44; // 16TB
   const size_t address_offset = ZUtils::round_up_power_of_2(MaxHeapSize * ZVirtualToPhysicalRatio);
   const size_t address_offset_bits = log2_intptr(address_offset);
-  return MIN2(MAX2(address_offset_bits, min_address_offset_bits), max_address_offset_bits);
+  return clamp(address_offset_bits, min_address_offset_bits, max_address_offset_bits);
 }
 
 size_t ZPlatformAddressMetadataShift() {