src/hotspot/share/runtime/thread.cpp

*** 112,126 ****
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/preserveException.hpp"
  #include "utilities/vmError.hpp"
! #if INCLUDE_ALL_GCS
! #include "gc/cms/concurrentMarkSweepThread.hpp"
! #include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
  #include "gc/parallel/pcTasks.hpp"
! #endif // INCLUDE_ALL_GCS
  #if INCLUDE_JVMCI
  #include "jvmci/jvmciCompiler.hpp"
  #include "jvmci/jvmciRuntime.hpp"
  #include "logging/logHandle.hpp"
  #endif
--- 112,124 ----
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/preserveException.hpp"
  #include "utilities/vmError.hpp"
! #if INCLUDE_PARALLELGC
  #include "gc/parallel/pcTasks.hpp"
! #endif
  #if INCLUDE_JVMCI
  #include "jvmci/jvmciCompiler.hpp"
  #include "jvmci/jvmciRuntime.hpp"
  #include "logging/logHandle.hpp"
  #endif
*** 4497,4507 ****
  void Threads::possibly_parallel_oops_do(bool is_par, OopClosure* f, CodeBlobClosure* cf) {
    ParallelOopsDoThreadClosure tc(f, cf);
    possibly_parallel_threads_do(is_par, &tc);
  }
  
! #if INCLUDE_ALL_GCS
  // Used by ParallelScavenge
  void Threads::create_thread_roots_tasks(GCTaskQueue* q) {
    ALL_JAVA_THREADS(p) {
      q->enqueue(new ThreadRootsTask(p));
    }
--- 4495,4505 ----
  void Threads::possibly_parallel_oops_do(bool is_par, OopClosure* f, CodeBlobClosure* cf) {
    ParallelOopsDoThreadClosure tc(f, cf);
    possibly_parallel_threads_do(is_par, &tc);
  }
  
! #if INCLUDE_PARALLELGC
  // Used by ParallelScavenge
  void Threads::create_thread_roots_tasks(GCTaskQueue* q) {
    ALL_JAVA_THREADS(p) {
      q->enqueue(new ThreadRootsTask(p));
    }
*** 4513,4523 ****
    ALL_JAVA_THREADS(p) {
      q->enqueue(new ThreadRootsMarkingTask(p));
    }
    q->enqueue(new ThreadRootsMarkingTask(VMThread::vm_thread()));
  }
! #endif // INCLUDE_ALL_GCS
  
  void Threads::nmethods_do(CodeBlobClosure* cf) {
    ALL_JAVA_THREADS(p) {
      // This is used by the code cache sweeper to mark nmethods that are active
      // on the stack of a Java thread. Ignore the sweeper thread itself to avoid
--- 4511,4521 ----
    ALL_JAVA_THREADS(p) {
      q->enqueue(new ThreadRootsMarkingTask(p));
    }
    q->enqueue(new ThreadRootsMarkingTask(VMThread::vm_thread()));
  }
! #endif // INCLUDE_PARALLELGC
  
  void Threads::nmethods_do(CodeBlobClosure* cf) {
    ALL_JAVA_THREADS(p) {
      // This is used by the code cache sweeper to mark nmethods that are active
      // on the stack of a Java thread. Ignore the sweeper thread itself to avoid