--- a/src/hotspot/share/gc/z/zHeap.cpp	Thu Apr 25 08:55:49 2019 +0200
+++ b/src/hotspot/share/gc/z/zHeap.cpp	Thu Apr 25 08:55:50 2019 +0200
@@ -173,7 +173,7 @@
 }
 
 bool ZHeap::is_in(uintptr_t addr) const {
-  if (addr < ZAddressReservedStart() || addr >= ZAddressReservedEnd()) {
+  if (addr < ZAddressReservedStart || addr >= ZAddressReservedEnd) {
     return false;
   }
 
@@ -269,13 +269,13 @@
 
 void ZHeap::flip_to_marked() {
   before_flip();
-  ZAddressMasks::flip_to_marked();
+  ZAddress::flip_to_marked();
   after_flip();
 }
 
 void ZHeap::flip_to_remapped() {
   before_flip();
-  ZAddressMasks::flip_to_remapped();
+  ZAddress::flip_to_remapped();
   after_flip();
 }