src/share/vm/memory/cardTableModRefBS.cpp

*** 21,35 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/cardTableModRefBS.inline.hpp"
  #include "memory/cardTableRS.hpp"
  #include "memory/genCollectedHeap.hpp"
- #include "memory/sharedHeap.hpp"
  #include "memory/space.hpp"
  #include "memory/space.inline.hpp"
  #include "memory/universe.hpp"
  #include "runtime/java.hpp"
  #include "runtime/mutexLocker.hpp"
--- 21,35 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "gc_interface/collectedHeap.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/cardTableModRefBS.inline.hpp"
  #include "memory/cardTableRS.hpp"
  #include "memory/genCollectedHeap.hpp"
  #include "memory/space.hpp"
  #include "memory/space.inline.hpp"
  #include "memory/universe.hpp"
  #include "runtime/java.hpp"
  #include "runtime/mutexLocker.hpp"
*** 449,466 ****
      // to get proper partitioning and termination.
      //
      // This is an example of where n_par_threads() is used instead
      // of workers()->active_workers().  n_par_threads can be set to 0 to
      // turn off parallelism.  For example when this code is called as
!     // part of verification and SharedHeap::process_roots() is being
!     // used, then n_par_threads() may have been set to 0.  active_workers
!     // is not overloaded with the meaning that it is a switch to disable
!     // parallelism and so keeps the meaning of the number of
!     // active gc workers.  If parallelism has not been shut off by
!     // setting n_par_threads to 0, then n_par_threads should be
!     // equal to active_workers.  When a different mechanism for shutting
!     // off parallelism is used, then active_workers can be used in
      // place of n_par_threads.
      int n_threads =  GenCollectedHeap::heap()->n_par_threads();
      bool is_par = n_threads > 0;
      if (is_par) {
  #if INCLUDE_ALL_GCS
--- 449,465 ----
      // to get proper partitioning and termination.
      //
      // This is an example of where n_par_threads() is used instead
      // of workers()->active_workers().  n_par_threads can be set to 0 to
      // turn off parallelism.  For example when this code is called as
!     // part of verification during root processing then n_par_threads()
!     // may have been set to 0. active_workers is not overloaded with
!     // the meaning that it is a switch to disable parallelism and so keeps
!     // the meaning of the number of active gc workers. If parallelism has
!     // not been shut off by setting n_par_threads to 0, then n_par_threads
!     // should be equal to active_workers.  When a different mechanism for
!     // shutting off parallelism is used, then active_workers can be used in
      // place of n_par_threads.
      int n_threads =  GenCollectedHeap::heap()->n_par_threads();
      bool is_par = n_threads > 0;
      if (is_par) {
  #if INCLUDE_ALL_GCS