src/hotspot/share/oops/oop.cpp

*** 24,33 ****
--- 24,34 ----
  
  #include "precompiled.hpp"
  #include "classfile/altHashing.hpp"
  #include "classfile/javaClasses.inline.hpp"
  #include "memory/resourceArea.hpp"
+ #include "oops/access.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/verifyOopClosure.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/thread.inline.hpp"
  #include "utilities/copy.hpp"
*** 153,163 ****
  #endif // PRODUCT
  
  VerifyOopClosure VerifyOopClosure::verify_oop;
  
  template <class T> void VerifyOopClosure::do_oop_work(T* p) {
!   oop obj = oopDesc::load_decode_heap_oop(p);
    guarantee(oopDesc::is_oop_or_null(obj), "invalid oop: " INTPTR_FORMAT, p2i((oopDesc*) obj));
  }
  
  void VerifyOopClosure::do_oop(oop* p)       { VerifyOopClosure::do_oop_work(p); }
  void VerifyOopClosure::do_oop(narrowOop* p) { VerifyOopClosure::do_oop_work(p); }
--- 154,164 ----
  #endif // PRODUCT
  
  VerifyOopClosure VerifyOopClosure::verify_oop;
  
  template <class T> void VerifyOopClosure::do_oop_work(T* p) {
!   oop obj = RawAccess<>::oop_load(p);
    guarantee(oopDesc::is_oop_or_null(obj), "invalid oop: " INTPTR_FORMAT, p2i((oopDesc*) obj));
  }
  
  void VerifyOopClosure::do_oop(oop* p)       { VerifyOopClosure::do_oop_work(p); }
  void VerifyOopClosure::do_oop(narrowOop* p) { VerifyOopClosure::do_oop_work(p); }