--- a/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp Fri Nov 22 10:03:38 2019 +0100
+++ b/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp Fri Nov 22 10:03:38 2019 +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() {