--- old/src/hotspot/share/gc/z/zBarrier.cpp	2019-04-10 18:50:13.256400200 -0400
+++ new/src/hotspot/share/gc/z/zBarrier.cpp	2019-04-10 18:50:12.343308900 -0400
@@ -123,7 +123,7 @@
 }
 
 void ZBarrier::load_barrier_on_oop_fields(oop o) {
-  assert(ZAddress::is_good(ZOop::to_address(o)), "Should be good");
+  assert(ZOop::is_good(o), "Should be good");
   ZLoadBarrierOopClosure cl;
   o->oop_iterate(&cl);
 }