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

*** 31,40 ****
--- 31,41 ----
  #include "gc/g1/g1RootClosures.hpp"
  #include "gc/g1/g1StringDedup.hpp"
  #include "gc/shared/gcTrace.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "memory/allocation.inline.hpp"
+ #include "oops/access.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  
  G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, uint worker_id, size_t young_cset_length)
    : _g1h(g1h),
*** 102,112 ****
  #ifdef ASSERT
  bool G1ParScanThreadState::verify_ref(narrowOop* ref) const {
    assert(ref != NULL, "invariant");
    assert(UseCompressedOops, "sanity");
    assert(!has_partial_array_mask(ref), "ref=" PTR_FORMAT, p2i(ref));
!   oop p = oopDesc::load_decode_heap_oop(ref);
    assert(_g1h->is_in_g1_reserved(p),
           "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
    return true;
  }
  
--- 103,113 ----
  #ifdef ASSERT
  bool G1ParScanThreadState::verify_ref(narrowOop* ref) const {
    assert(ref != NULL, "invariant");
    assert(UseCompressedOops, "sanity");
    assert(!has_partial_array_mask(ref), "ref=" PTR_FORMAT, p2i(ref));
!   oop p = RawAccess<>::oop_load(ref);
    assert(_g1h->is_in_g1_reserved(p),
           "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
    return true;
  }
  
*** 116,126 ****
      // Must be in the collection set--it's already been copied.
      oop p = clear_partial_array_mask(ref);
      assert(_g1h->is_in_cset(p),
             "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
    } else {
!     oop p = oopDesc::load_decode_heap_oop(ref);
      assert(_g1h->is_in_g1_reserved(p),
             "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
    }
    return true;
  }
--- 117,127 ----
      // Must be in the collection set--it's already been copied.
      oop p = clear_partial_array_mask(ref);
      assert(_g1h->is_in_cset(p),
             "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
    } else {
!     oop p = RawAccess<>::oop_load(ref);
      assert(_g1h->is_in_g1_reserved(p),
             "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
    }
    return true;
  }