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

*** 75,84 ****
--- 75,86 ----
  #include "gc/shared/weakProcessor.hpp"
  #include "logging/log.hpp"
  #include "memory/allocation.hpp"
  #include "memory/iterator.hpp"
  #include "memory/resourceArea.hpp"
+ #include "oops/access.inline.hpp"
+ #include "oops/compressedOops.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "prims/resolvedMethodTable.hpp"
  #include "runtime/atomic.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/init.hpp"
*** 3808,3818 ****
  
    virtual void do_oop(narrowOop* p) { do_oop_work(p); }
    virtual 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 (_g1h->is_in_cset_or_humongous(obj)) {
        // If the referent object has been forwarded (either copied
        // to a new location or to itself in the event of an
        // evacuation failure) then we need to update the reference
--- 3810,3820 ----
  
    virtual void do_oop(narrowOop* p) { do_oop_work(p); }
    virtual 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 (_g1h->is_in_cset_or_humongous(obj)) {
        // If the referent object has been forwarded (either copied
        // to a new location or to itself in the event of an
        // evacuation failure) then we need to update the reference
*** 5213,5225 ****
  class RegisterNMethodOopClosure: public OopClosure {
    G1CollectedHeap* _g1h;
    nmethod* _nm;
  
    template <class T> void do_oop_work(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);
        HeapRegion* hr = _g1h->heap_region_containing(obj);
        assert(!hr->is_continues_humongous(),
               "trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
               " starting at " HR_FORMAT,
               p2i(_nm), HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()));
--- 5215,5227 ----
  class RegisterNMethodOopClosure: public OopClosure {
    G1CollectedHeap* _g1h;
    nmethod* _nm;
  
    template <class T> void do_oop_work(T* p) {
!     T heap_oop = RawAccess<>::oop_load(p);
!     if (!CompressedOops::is_null(heap_oop)) {
!       oop obj = CompressedOops::decode_not_null(heap_oop);
        HeapRegion* hr = _g1h->heap_region_containing(obj);
        assert(!hr->is_continues_humongous(),
               "trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
               " starting at " HR_FORMAT,
               p2i(_nm), HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()));
*** 5240,5252 ****
  class UnregisterNMethodOopClosure: public OopClosure {
    G1CollectedHeap* _g1h;
    nmethod* _nm;
  
    template <class T> void do_oop_work(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);
        HeapRegion* hr = _g1h->heap_region_containing(obj);
        assert(!hr->is_continues_humongous(),
               "trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
               " starting at " HR_FORMAT,
               p2i(_nm), HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()));
--- 5242,5254 ----
  class UnregisterNMethodOopClosure: public OopClosure {
    G1CollectedHeap* _g1h;
    nmethod* _nm;
  
    template <class T> void do_oop_work(T* p) {
!     T heap_oop = RawAccess<>::oop_load(p);
!     if (!CompressedOops::is_null(heap_oop)) {
!       oop obj = CompressedOops::decode_not_null(heap_oop);
        HeapRegion* hr = _g1h->heap_region_containing(obj);
        assert(!hr->is_continues_humongous(),
               "trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
               " starting at " HR_FORMAT,
               p2i(_nm), HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()));