src/share/vm/gc_implementation/parNew/parNewGeneration.cpp

rev 6796 : [mq]: templateOopIterate
rev 6801 : imported patch defaultToTrue

*** 33,52 ****
  #include "gc_implementation/shared/gcTimer.hpp"
  #include "gc_implementation/shared/gcTrace.hpp"
  #include "gc_implementation/shared/gcTraceTime.hpp"
  #include "gc_implementation/shared/parGCAllocBuffer.inline.hpp"
  #include "gc_implementation/shared/spaceDecorator.hpp"
  #include "memory/defNewGeneration.inline.hpp"
! #include "memory/genCollectedHeap.hpp"
  #include "memory/genOopClosures.inline.hpp"
  #include "memory/generation.hpp"
  #include "memory/generation.inline.hpp"
  #include "memory/referencePolicy.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/sharedHeap.hpp"
  #include "memory/space.hpp"
! #include "oops/objArrayOop.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/oop.pcgc.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/handles.hpp"
  #include "runtime/handles.inline.hpp"
--- 33,53 ----
  #include "gc_implementation/shared/gcTimer.hpp"
  #include "gc_implementation/shared/gcTrace.hpp"
  #include "gc_implementation/shared/gcTraceTime.hpp"
  #include "gc_implementation/shared/parGCAllocBuffer.inline.hpp"
  #include "gc_implementation/shared/spaceDecorator.hpp"
+ #include "gc_interface/collectedHeap.inline.hpp"
  #include "memory/defNewGeneration.inline.hpp"
! #include "memory/genCollectedHeap.inline.hpp"
  #include "memory/genOopClosures.inline.hpp"
  #include "memory/generation.hpp"
  #include "memory/generation.inline.hpp"
  #include "memory/referencePolicy.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/sharedHeap.hpp"
  #include "memory/space.hpp"
! #include "oops/objArrayOop.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/oop.pcgc.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/handles.hpp"
  #include "runtime/handles.inline.hpp"
*** 146,159 ****
  
    // process our set of indices (include header in first chunk)
    // should make sure end is even (aligned to HeapWord in case of compressed oops)
    if ((HeapWord *)obj < young_old_boundary()) {
      // object is in to_space
!     obj->oop_iterate_range(&_to_space_closure, start, end);
    } else {
      // object is in old generation
!     obj->oop_iterate_range(&_old_gen_closure, start, end);
    }
  }
  
  
  void ParScanThreadState::trim_queues(int max_size) {
--- 147,160 ----
  
    // process our set of indices (include header in first chunk)
    // should make sure end is even (aligned to HeapWord in case of compressed oops)
    if ((HeapWord *)obj < young_old_boundary()) {
      // object is in to_space
!     obj->oop_iterate_range_t<true>(&_to_space_closure, start, end);
    } else {
      // object is in old generation
!     obj->oop_iterate_range_t<true>(&_old_gen_closure, start, end);
    }
  }
  
  
  void ParScanThreadState::trim_queues(int max_size) {
*** 873,883 ****
  
  void EvacuateFollowersClosureGeneral::do_void() {
    do {
      // Beware: this call will lead to closure applications via virtual
      // calls.
!     _gch->oop_since_save_marks_iterate(_level,
                                         _scan_cur_or_nonheap,
                                         _scan_older);
    } while (!_gch->no_allocs_since_save_marks(_level));
  }
  
--- 874,884 ----
  
  void EvacuateFollowersClosureGeneral::do_void() {
    do {
      // Beware: this call will lead to closure applications via virtual
      // calls.
!     _gch->gch_oop_since_save_marks_iterate<false>(_level,
                                         _scan_cur_or_nonheap,
                                         _scan_older);
    } while (!_gch->no_allocs_since_save_marks(_level));
  }