--- old/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddressRangeMapForPageTable.java	2019-02-25 15:07:37.371683785 +0100
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddressRangeMapForPageTable.java	2019-02-25 15:07:37.165677176 +0100
@@ -34,8 +34,6 @@
 public class ZAddressRangeMapForPageTable  extends VMObject {
     private static AddressField mapField;
 
-    private static long AddressRangeShift = ZGlobals.ZPageSizeMinShift;
-
     static {
         VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
     }
@@ -55,11 +53,11 @@
     }
 
     public long size() {
-        return ZGlobals.ZAddressOffsetMax >> AddressRangeShift;
+        return ZGlobals.ZAddressOffsetMax >> ZGlobals.ZGranuleSizeShift;
     }
 
     private long index_for_addr(Address addr) {
-        long index = ZAddress.offset(addr) >> AddressRangeShift;
+        long index = ZAddress.offset(addr) >> ZGlobals.ZGranuleSizeShift;
 
         return index;
     }