src/hotspot/share/gc/g1/g1HeapVerifier.cpp

*** 36,45 ****
--- 36,47 ----
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "gc/g1/g1StringDedup.hpp"
  #include "logging/log.hpp"
  #include "logging/logStream.hpp"
  #include "memory/resourceArea.hpp"
+ #include "oops/access.inline.hpp"
+ #include "oops/compressedOops.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/handles.inline.hpp"
  
  class VerifyRootsClosure: public OopClosure {
  private:
*** 56,68 ****
      _failures(false) { }
  
    bool failures() { return _failures; }
  
    template <class T> void do_oop_nv(T* p) {
!     T heap_oop = oopDesc::load_heap_oop(p);
!     if (!oopDesc::is_null(heap_oop)) {
!       oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
        if (_g1h->is_obj_dead_cond(obj, _vo)) {
          Log(gc, verify) log;
          log.error("Root location " PTR_FORMAT " points to dead obj " PTR_FORMAT, p2i(p), p2i(obj));
          ResourceMark rm;
          LogStream ls(log.error());
--- 58,70 ----
      _failures(false) { }
  
    bool failures() { return _failures; }
  
    template <class T> void do_oop_nv(T* p) {
!     T heap_oop = RawAccess<>::oop_load(p);
!     if (!CompressedOops::is_null(heap_oop)) {
!       oop obj = CompressedOops::decode_not_null(heap_oop);
        if (_g1h->is_obj_dead_cond(obj, _vo)) {
          Log(gc, verify) log;
          log.error("Root location " PTR_FORMAT " points to dead obj " PTR_FORMAT, p2i(p), p2i(obj));
          ResourceMark rm;
          LogStream ls(log.error());
*** 99,111 ****
  
      // Now verify that the current nmethod (which contains p) is
      // in the code root list of the heap region containing the
      // object referenced by p.
  
!     T heap_oop = oopDesc::load_heap_oop(p);
!     if (!oopDesc::is_null(heap_oop)) {
!       oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
  
        // Now fetch the region containing the object
        HeapRegion* hr = _g1h->heap_region_containing(obj);
        HeapRegionRemSet* hrrs = hr->rem_set();
        // Verify that the strong code root list for this region
--- 101,113 ----
  
      // Now verify that the current nmethod (which contains p) is
      // in the code root list of the heap region containing the
      // object referenced by p.
  
!     T heap_oop = RawAccess<>::oop_load(p);
!     if (!CompressedOops::is_null(heap_oop)) {
!       oop obj = CompressedOops::decode_not_null(heap_oop);
  
        // Now fetch the region containing the object
        HeapRegion* hr = _g1h->heap_region_containing(obj);
        HeapRegionRemSet* hrrs = hr->rem_set();
        // Verify that the strong code root list for this region
*** 184,194 ****
    { }
    void do_oop(narrowOop *p) { do_oop_work(p); }
    void do_oop(      oop *p) { do_oop_work(p); }
  
    template <class T> void do_oop_work(T *p) {
!     oop obj = oopDesc::load_decode_heap_oop(p);
      guarantee(obj == NULL || !_g1h->is_obj_dead_cond(obj, _vo),
                "Dead object referenced by a not dead object");
    }
  };
  
--- 186,196 ----
    { }
    void do_oop(narrowOop *p) { do_oop_work(p); }
    void do_oop(      oop *p) { do_oop_work(p); }
  
    template <class T> void do_oop_work(T *p) {
!     oop obj = RawAccess<>::oop_load(p);
      guarantee(obj == NULL || !_g1h->is_obj_dead_cond(obj, _vo),
                "Dead object referenced by a not dead object");
    }
  };
  
*** 238,248 ****
      : _hr(hr) { }
    void do_oop(narrowOop *p) { do_oop_work(p); }
    void do_oop(      oop *p) { do_oop_work(p); }
  
    template <class T> void do_oop_work(T *p) {
!     oop obj = oopDesc::load_decode_heap_oop(p);
  
      if (_hr->is_open_archive()) {
        guarantee(obj == NULL || G1ArchiveAllocator::is_archive_object(obj),
                  "Archive object at " PTR_FORMAT " references a non-archive object at " PTR_FORMAT,
                  p2i(p), p2i(obj));
--- 240,250 ----
      : _hr(hr) { }
    void do_oop(narrowOop *p) { do_oop_work(p); }
    void do_oop(      oop *p) { do_oop_work(p); }
  
    template <class T> void do_oop_work(T *p) {
!     oop obj = RawAccess<>::oop_load(p);
  
      if (_hr->is_open_archive()) {
        guarantee(obj == NULL || G1ArchiveAllocator::is_archive_object(obj),
                  "Archive object at " PTR_FORMAT " references a non-archive object at " PTR_FORMAT,
                  p2i(p), p2i(obj));