src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp

rev 6796 : [mq]: templateOopIterate
rev 6799 : [mq]: latestChanges

*** 60,69 ****
--- 60,72 ----
  #include "memory/allocation.hpp"
  #include "memory/gcLocker.inline.hpp"
  #include "memory/generationSpec.hpp"
  #include "memory/iterator.hpp"
  #include "memory/referenceProcessor.hpp"
+ #include "memory/space.inline.hpp"
+ #include "oops/objArrayKlass.hpp"
+ #include "oops/objArrayOop.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/oop.pcgc.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/orderAccess.inline.hpp"
  #include "runtime/vmThread.hpp"
*** 4523,4533 ****
    assert(_evac_failure_scan_stack != NULL, "precondition");
  
    while (_evac_failure_scan_stack->length() > 0) {
       oop obj = _evac_failure_scan_stack->pop();
       _evac_failure_closure->set_region(heap_region_containing(obj));
!      obj->oop_iterate_backwards(_evac_failure_closure);
    }
  }
  
  oop
  G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state,
--- 4526,4536 ----
    assert(_evac_failure_scan_stack != NULL, "precondition");
  
    while (_evac_failure_scan_stack->length() > 0) {
       oop obj = _evac_failure_scan_stack->pop();
       _evac_failure_closure->set_region(heap_region_containing(obj));
!      obj->oop_iterate_backwards<false>(_evac_failure_closure);
    }
  }
  
  oop
  G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state,