src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp

*** 26,41 ****
  #include "classfile/systemDictionary.hpp"
  #include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
  #include "gc_implementation/parallelScavenge/objectStartArray.hpp"
  #include "gc_implementation/parallelScavenge/parMarkBitMap.hpp"
  #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
! #include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
  #include "gc_implementation/parallelScavenge/psOldGen.hpp"
  #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
  #include "oops/objArrayKlass.inline.hpp"
  #include "oops/oop.inline.hpp"
- #include "oops/oop.pcgc.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "utilities/stack.inline.hpp"
  
  PSOldGen*            ParCompactionManager::_old_gen = NULL;
  ParCompactionManager**  ParCompactionManager::_manager_array = NULL;
--- 26,40 ----
  #include "classfile/systemDictionary.hpp"
  #include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
  #include "gc_implementation/parallelScavenge/objectStartArray.hpp"
  #include "gc_implementation/parallelScavenge/parMarkBitMap.hpp"
  #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
! #include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
  #include "gc_implementation/parallelScavenge/psOldGen.hpp"
  #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
  #include "oops/objArrayKlass.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "utilities/stack.inline.hpp"
  
  PSOldGen*            ParCompactionManager::_old_gen = NULL;
  ParCompactionManager**  ParCompactionManager::_manager_array = NULL;
*** 178,198 ****
  void ParCompactionManager::follow_marking_stacks() {
    do {
      // Drain the overflow stack first, to allow stealing from the marking stack.
      oop obj;
      while (marking_stack()->pop_overflow(obj)) {
!       obj->follow_contents(this);
      }
      while (marking_stack()->pop_local(obj)) {
!       obj->follow_contents(this);
      }
  
      // Process ObjArrays one at a time to avoid marking stack bloat.
      ObjArrayTask task;
      if (_objarray_stack.pop_overflow(task) || _objarray_stack.pop_local(task)) {
!       ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass();
!       k->oop_follow_contents(this, task.obj(), task.index());
      }
    } while (!marking_stacks_empty());
  
    assert(marking_stacks_empty(), "Sanity");
  }
--- 177,196 ----
  void ParCompactionManager::follow_marking_stacks() {
    do {
      // Drain the overflow stack first, to allow stealing from the marking stack.
      oop obj;
      while (marking_stack()->pop_overflow(obj)) {
!       follow_contents(obj);
      }
      while (marking_stack()->pop_local(obj)) {
!       follow_contents(obj);
      }
  
      // Process ObjArrays one at a time to avoid marking stack bloat.
      ObjArrayTask task;
      if (_objarray_stack.pop_overflow(task) || _objarray_stack.pop_local(task)) {
!       follow_contents((objArrayOop)task.obj(), task.index());
      }
    } while (!marking_stacks_empty());
  
    assert(marking_stacks_empty(), "Sanity");
  }