--- old/src/hotspot/share/gc/z/zBarrier.inline.hpp	2019-04-10 18:50:18.162890800 -0400
+++ new/src/hotspot/share/gc/z/zBarrier.inline.hpp	2019-04-10 18:50:17.259800500 -0400
@@ -37,7 +37,7 @@
 retry:
   // Fast path
   if (fast_path(addr)) {
-    return ZOop::from_address(addr);
+    return ZOop::to_oop(addr);
   }
 
   // Slow path
@@ -56,7 +56,7 @@
     }
   }
 
-  return ZOop::from_address(good_addr);
+  return ZOop::to_oop(good_addr);
 }
 
 template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path>
@@ -67,7 +67,7 @@
   if (fast_path(addr)) {
     // Return the good address instead of the weak good address
     // to ensure that the currently active heap view is used.
-    return ZOop::from_address(ZAddress::good_or_null(addr));
+    return ZOop::to_oop(ZAddress::good_or_null(addr));
   }
 
   // Slow path
@@ -95,7 +95,7 @@
     }
   }
 
-  return ZOop::from_address(good_addr);
+  return ZOop::to_oop(good_addr);
 }
 
 template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path>
@@ -117,7 +117,7 @@
   // to heal the same root if it is aligned, since they would always heal
   // the root in the same way and it does not matter in which order it
   // happens. For misaligned oops, there needs to be mutual exclusion.
-  *p = ZOop::from_address(good_addr);
+  *p = ZOop::to_oop(good_addr);
 }
 
 inline bool ZBarrier::is_null_fast_path(uintptr_t addr) {