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

*** 55,65 ****
    NOT_PRODUCT(GCTraceTime tm("ThreadRootsMarkingTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
  
!   PSParallelCompact::MarkAndPushClosure mark_and_push_closure(cm);
    CLDToOopClosure mark_and_push_from_clds(&mark_and_push_closure, true);
    MarkingCodeBlobClosure mark_and_push_in_blobs(&mark_and_push_closure, !CodeBlobToOopClosure::FixRelocations);
  
    if (_java_thread != NULL)
      _java_thread->oops_do(
--- 55,65 ----
    NOT_PRODUCT(GCTraceTime tm("ThreadRootsMarkingTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
  
!   ParCompactionManager::MarkAndPushClosure mark_and_push_closure(cm);
    CLDToOopClosure mark_and_push_from_clds(&mark_and_push_closure, true);
    MarkingCodeBlobClosure mark_and_push_in_blobs(&mark_and_push_closure, !CodeBlobToOopClosure::FixRelocations);
  
    if (_java_thread != NULL)
      _java_thread->oops_do(
*** 83,94 ****
  
    NOT_PRODUCT(GCTraceTime tm("MarkFromRootsTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
!   PSParallelCompact::MarkAndPushClosure mark_and_push_closure(cm);
!   PSParallelCompact::FollowKlassClosure follow_klass_closure(&mark_and_push_closure);
  
    switch (_root_type) {
      case universe:
        Universe::oops_do(&mark_and_push_closure);
        break;
--- 83,94 ----
  
    NOT_PRODUCT(GCTraceTime tm("MarkFromRootsTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
!   ParCompactionManager::MarkAndPushClosure mark_and_push_closure(cm);
!   ParCompactionManager::FollowKlassClosure follow_klass_closure(&mark_and_push_closure);
  
    switch (_root_type) {
      case universe:
        Universe::oops_do(&mark_and_push_closure);
        break;
*** 154,165 ****
  
    NOT_PRODUCT(GCTraceTime tm("RefProcTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
!   PSParallelCompact::MarkAndPushClosure mark_and_push_closure(cm);
!   PSParallelCompact::FollowStackClosure follow_stack_closure(cm);
    _rp_task.work(_work_id, *PSParallelCompact::is_alive_closure(),
                  mark_and_push_closure, follow_stack_closure);
  }
  
  //
--- 154,165 ----
  
    NOT_PRODUCT(GCTraceTime tm("RefProcTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
!   ParCompactionManager::MarkAndPushClosure mark_and_push_closure(cm);
!   ParCompactionManager::FollowStackClosure follow_stack_closure(cm);
    _rp_task.work(_work_id, *PSParallelCompact::is_alive_closure(),
                  mark_and_push_closure, follow_stack_closure);
  }
  
  //
*** 211,221 ****
    NOT_PRODUCT(GCTraceTime tm("StealMarkingTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
  
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
!   PSParallelCompact::MarkAndPushClosure mark_and_push_closure(cm);
  
    oop obj = NULL;
    ObjArrayTask task;
    int random_seed = 17;
    do {
--- 211,221 ----
    NOT_PRODUCT(GCTraceTime tm("StealMarkingTask",
      PrintGCDetails && TraceParallelOldGCTasks, true, NULL, PSParallelCompact::gc_tracer()->gc_id()));
  
    ParCompactionManager* cm =
      ParCompactionManager::gc_thread_compaction_manager(which);
!   ParCompactionManager::MarkAndPushClosure mark_and_push_closure(cm);
  
    oop obj = NULL;
    ObjArrayTask task;
    int random_seed = 17;
    do {