src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp

rev 8070 : imported patch gencollected_heap_cleanup

*** 68,78 ****
  
  template <class T>
  inline void ParScanClosure::do_oop_work(T* p,
                                          bool gc_barrier,
                                          bool root_scan) {
!   assert((!Universe::heap()->is_in_reserved(p) ||
            generation()->is_in_reserved(p))
           && (generation()->level() == 0 || gc_barrier),
           "The gen must be right, and we must be doing the barrier "
           "in older generations.");
    T heap_oop = oopDesc::load_heap_oop(p);
--- 68,78 ----
  
  template <class T>
  inline void ParScanClosure::do_oop_work(T* p,
                                          bool gc_barrier,
                                          bool root_scan) {
!   assert((!GenCollectedHeap::heap()->is_in_reserved(p) ||
            generation()->is_in_reserved(p))
           && (generation()->level() == 0 || gc_barrier),
           "The gen must be right, and we must be doing the barrier "
           "in older generations.");
    T heap_oop = oopDesc::load_heap_oop(p);
*** 80,90 ****
      oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
      if ((HeapWord*)obj < _boundary) {
  #ifndef PRODUCT
        if (_g->to()->is_in_reserved(obj)) {
          tty->print_cr("Scanning field (" PTR_FORMAT ") twice?", p2i(p));
!         GenCollectedHeap* gch =  (GenCollectedHeap*)Universe::heap();
          Space* sp = gch->space_containing(p);
          oop obj = oop(sp->block_start(p));
          assert((HeapWord*)obj < (HeapWord*)p, "Error");
          tty->print_cr("Object: " PTR_FORMAT, p2i((void *)obj));
          tty->print_cr("-------");
--- 80,90 ----
      oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
      if ((HeapWord*)obj < _boundary) {
  #ifndef PRODUCT
        if (_g->to()->is_in_reserved(obj)) {
          tty->print_cr("Scanning field (" PTR_FORMAT ") twice?", p2i(p));
!         GenCollectedHeap* gch = GenCollectedHeap::heap();
          Space* sp = gch->space_containing(p);
          oop obj = oop(sp->block_start(p));
          assert((HeapWord*)obj < (HeapWord*)p, "Error");
          tty->print_cr("Object: " PTR_FORMAT, p2i((void *)obj));
          tty->print_cr("-------");