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

*** 25,42 ****
  #include "precompiled.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
  #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
  #include "gc_implementation/parallelScavenge/pcTasks.hpp"
  #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
  #include "gc_implementation/shared/gcTimer.hpp"
  #include "gc_implementation/shared/gcTraceTime.hpp"
  #include "gc_interface/collectedHeap.hpp"
  #include "memory/universe.hpp"
  #include "oops/objArrayKlass.inline.hpp"
  #include "oops/oop.inline.hpp"
- #include "oops/oop.pcgc.inline.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/jniHandles.hpp"
  #include "runtime/thread.hpp"
  #include "runtime/vmThread.hpp"
--- 25,42 ----
  #include "precompiled.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
  #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
  #include "gc_implementation/parallelScavenge/pcTasks.hpp"
+ #include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
  #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
  #include "gc_implementation/shared/gcTimer.hpp"
  #include "gc_implementation/shared/gcTraceTime.hpp"
  #include "gc_interface/collectedHeap.hpp"
  #include "memory/universe.hpp"
  #include "oops/objArrayKlass.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/jniHandles.hpp"
  #include "runtime/thread.hpp"
  #include "runtime/vmThread.hpp"
*** 219,234 ****
    oop obj = NULL;
    ObjArrayTask task;
    int random_seed = 17;
    do {
      while (ParCompactionManager::steal_objarray(which, &random_seed, task)) {
!       ObjArrayKlass* k = (ObjArrayKlass*)task.obj()->klass();
!       k->oop_follow_contents(cm, task.obj(), task.index());
        cm->follow_marking_stacks();
      }
      while (ParCompactionManager::steal(which, &random_seed, obj)) {
!       obj->follow_contents(cm);
        cm->follow_marking_stacks();
      }
    } while (!terminator()->offer_termination());
  }
  
--- 219,233 ----
    oop obj = NULL;
    ObjArrayTask task;
    int random_seed = 17;
    do {
      while (ParCompactionManager::steal_objarray(which, &random_seed, task)) {
!       cm->follow_contents((objArrayOop)task.obj(), task.index());
        cm->follow_marking_stacks();
      }
      while (ParCompactionManager::steal(which, &random_seed, obj)) {
!       cm->follow_contents(obj);
        cm->follow_marking_stacks();
      }
    } while (!terminator()->offer_termination());
  }