src/hotspot/share/gc/parallel/psScavenge.inline.hpp

*** 29,54 ****
  #include "gc/parallel/psPromotionManager.inline.hpp"
  #include "gc/parallel/psScavenge.hpp"
  #include "logging/log.hpp"
  #include "memory/iterator.hpp"
  #include "memory/resourceArea.hpp"
  #include "utilities/globalDefinitions.hpp"
  
  inline void PSScavenge::save_to_space_top_before_gc() {
    ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
    _to_space_top_before_gc = heap->young_gen()->to_space()->top();
  }
  
  template <class T> inline bool PSScavenge::should_scavenge(T* p) {
!   T heap_oop = oopDesc::load_heap_oop(p);
    return PSScavenge::is_obj_in_young(heap_oop);
  }
  
  template <class T>
  inline bool PSScavenge::should_scavenge(T* p, MutableSpace* to_space) {
    if (should_scavenge(p)) {
!     oop obj = oopDesc::load_decode_heap_oop_not_null(p);
      // Skip objects copied to to_space since the scavenge started.
      HeapWord* const addr = (HeapWord*)obj;
      return addr < to_space_top_before_gc() || addr >= to_space->end();
    }
    return false;
--- 29,55 ----
  #include "gc/parallel/psPromotionManager.inline.hpp"
  #include "gc/parallel/psScavenge.hpp"
  #include "logging/log.hpp"
  #include "memory/iterator.hpp"
  #include "memory/resourceArea.hpp"
+ #include "oops/access.inline.hpp"
  #include "utilities/globalDefinitions.hpp"
  
  inline void PSScavenge::save_to_space_top_before_gc() {
    ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
    _to_space_top_before_gc = heap->young_gen()->to_space()->top();
  }
  
  template <class T> inline bool PSScavenge::should_scavenge(T* p) {
!   T heap_oop = RawAccess<>::oop_load(p);
    return PSScavenge::is_obj_in_young(heap_oop);
  }
  
  template <class T>
  inline bool PSScavenge::should_scavenge(T* p, MutableSpace* to_space) {
    if (should_scavenge(p)) {
!     oop obj = RawAccess<OOP_NOT_NULL>::oop_load(p);
      // Skip objects copied to to_space since the scavenge started.
      HeapWord* const addr = (HeapWord*)obj;
      return addr < to_space_top_before_gc() || addr >= to_space->end();
    }
    return false;
*** 105,115 ****
        if (o->is_forwarded()) {
          new_obj = o->forwardee();
        } else {
          new_obj = _pm->copy_to_survivor_space</*promote_immediately=*/false>(o);
        }
!       oopDesc::encode_store_heap_oop_not_null(p, new_obj);
  
        if (PSScavenge::is_obj_in_young(new_obj)) {
          do_cld_barrier();
        }
      }
--- 106,116 ----
        if (o->is_forwarded()) {
          new_obj = o->forwardee();
        } else {
          new_obj = _pm->copy_to_survivor_space</*promote_immediately=*/false>(o);
        }
!       RawAccess<>::oop_store(p, new_obj);
  
        if (PSScavenge::is_obj_in_young(new_obj)) {
          do_cld_barrier();
        }
      }