diff -r 44dc3d796110 -r 3aba4a42d8ad src/hotspot/share/gc/z/zForwardingTable.inline.hpp
--- a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp	Mon Oct 28 11:21:23 2019 +0100
+++ b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp	Mon Oct 28 11:23:28 2019 +0100
@@ -24,11 +24,13 @@
 #ifndef SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
 #define SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
 
+#include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zForwardingTable.hpp"
 #include "gc/z/zGranuleMap.inline.hpp"
 
 inline ZForwarding* ZForwardingTable::get(uintptr_t addr) const {
-  return _map.get(addr);
+  assert(!ZAddress::is_null(addr), "Invalid address");
+  return _map.get(ZAddress::offset(addr));
 }
 
 #endif // SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP