src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp

rev 8068 : imported patch parallelscavenge_cleanup

*** 31,41 ****
  #include "gc_implementation/parallelScavenge/psScavenge.hpp"
  #include "memory/iterator.hpp"
  #include "utilities/globalDefinitions.hpp"
  
  inline void PSScavenge::save_to_space_top_before_gc() {
!   ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::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);
--- 31,41 ----
  #include "gc_implementation/parallelScavenge/psScavenge.hpp"
  #include "memory/iterator.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);
*** 54,64 ****
  }
  
  template <class T>
  inline bool PSScavenge::should_scavenge(T* p, bool check_to_space) {
    if (check_to_space) {
!     ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
      return should_scavenge(p, heap->young_gen()->to_space());
    }
    return should_scavenge(p);
  }
  
--- 54,64 ----
  }
  
  template <class T>
  inline bool PSScavenge::should_scavenge(T* p, bool check_to_space) {
    if (check_to_space) {
!     ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
      return should_scavenge(p, heap->young_gen()->to_space());
    }
    return should_scavenge(p);
  }
  
*** 95,105 ****
    void do_oop(narrowOop* p) { ShouldNotReachHere(); }
    void do_oop(oop* p)       {
      ParallelScavengeHeap* psh = ParallelScavengeHeap::heap();
      assert(!psh->is_in_reserved(p), "GC barrier needed");
      if (PSScavenge::should_scavenge(p)) {
-       assert(!Universe::heap()->is_in_reserved(p), "Not from meta-data?");
        assert(PSScavenge::should_scavenge(p, true), "revisiting object?");
  
        oop o = *p;
        oop new_obj;
        if (o->is_forwarded()) {
--- 95,104 ----