--- a/src/hotspot/share/oops/instanceKlass.cpp	Fri Mar 23 12:55:39 2018 +0100
+++ b/src/hotspot/share/oops/instanceKlass.cpp	Thu Mar 15 21:24:10 2018 +0100
@@ -3210,7 +3210,7 @@
 class VerifyFieldClosure: public OopClosure {
  protected:
   template <class T> void do_oop_work(T* p) {
-    oop obj = oopDesc::load_decode_heap_oop(p);
+    oop obj = RawAccess<>::oop_load(p);
     if (!oopDesc::is_oop_or_null(obj)) {
       tty->print_cr("Failed: " PTR_FORMAT " -> " PTR_FORMAT, p2i(p), p2i(obj));
       Universe::print_on(tty);