src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp

*** 671,684 ****
  #define FreeListSpace_DCTOC__walk_mem_region_with_cl_DEFN(ClosureType)          \
  void FreeListSpace_DCTOC::walk_mem_region_with_cl(MemRegion mr,                 \
                                                   HeapWord* bottom,              \
                                                   HeapWord* top,                 \
                                                   ClosureType* cl) {             \
!    bool is_par = SharedHeap::heap()->n_par_threads() > 0;                       \
     if (is_par) {                                                                \
!      assert(SharedHeap::heap()->n_par_threads() ==                              \
!             SharedHeap::heap()->workers()->active_workers(), "Mismatch");       \
       walk_mem_region_with_cl_par(mr, bottom, top, cl);                          \
     } else {                                                                     \
       walk_mem_region_with_cl_nopar(mr, bottom, top, cl);                        \
     }                                                                            \
  }                                                                               \
--- 671,684 ----
  #define FreeListSpace_DCTOC__walk_mem_region_with_cl_DEFN(ClosureType)          \
  void FreeListSpace_DCTOC::walk_mem_region_with_cl(MemRegion mr,                 \
                                                   HeapWord* bottom,              \
                                                   HeapWord* top,                 \
                                                   ClosureType* cl) {             \
!    bool is_par = GenCollectedHeap::heap()->n_par_threads() > 0;                 \
     if (is_par) {                                                                \
!      assert(GenCollectedHeap::heap()->n_par_threads() ==                        \
!             GenCollectedHeap::heap()->workers()->active_workers(), "Mismatch"); \
       walk_mem_region_with_cl_par(mr, bottom, top, cl);                          \
     } else {                                                                     \
       walk_mem_region_with_cl_nopar(mr, bottom, top, cl);                        \
     }                                                                            \
  }                                                                               \
*** 1905,1919 ****
    // adjust block offset table
    OrderAccess::storestore();
    assert(chunk->is_free() && ffc->is_free(), "Error");
    _bt.split_block((HeapWord*)chunk, chunk->size(), new_size);
    if (rem_sz < SmallForDictionary) {
!     bool is_par = (SharedHeap::heap()->n_par_threads() > 0);
      if (is_par) _indexedFreeListParLocks[rem_sz]->lock();
      assert(!is_par ||
!            (SharedHeap::heap()->n_par_threads() ==
!             SharedHeap::heap()->workers()->active_workers()), "Mismatch");
      returnChunkToFreeList(ffc);
      split(size, rem_sz);
      if (is_par) _indexedFreeListParLocks[rem_sz]->unlock();
    } else {
      returnChunkToDictionary(ffc);
--- 1905,1919 ----
    // adjust block offset table
    OrderAccess::storestore();
    assert(chunk->is_free() && ffc->is_free(), "Error");
    _bt.split_block((HeapWord*)chunk, chunk->size(), new_size);
    if (rem_sz < SmallForDictionary) {
!     bool is_par = (GenCollectedHeap::heap()->n_par_threads() > 0);
      if (is_par) _indexedFreeListParLocks[rem_sz]->lock();
      assert(!is_par ||
!            (GenCollectedHeap::heap()->n_par_threads() ==
!             GenCollectedHeap::heap()->workers()->active_workers()), "Mismatch");
      returnChunkToFreeList(ffc);
      split(size, rem_sz);
      if (is_par) _indexedFreeListParLocks[rem_sz]->unlock();
    } else {
      returnChunkToDictionary(ffc);
*** 1980,1999 ****
    _promoInfo.startTrackingPromotions();
  }
  
  bool CompactibleFreeListSpace::no_allocs_since_save_marks() {
    assert(_promoInfo.tracking(), "No preceding save_marks?");
!   assert(SharedHeap::heap()->n_par_threads() == 0,
           "Shouldn't be called if using parallel gc.");
    return _promoInfo.noPromotions();
  }
  
  #define CFLS_OOP_SINCE_SAVE_MARKS_DEFN(OopClosureType, nv_suffix)           \
                                                                              \
  void CompactibleFreeListSpace::                                             \
  oop_since_save_marks_iterate##nv_suffix(OopClosureType* blk) {              \
!   assert(SharedHeap::heap()->n_par_threads() == 0,                          \
           "Shouldn't be called (yet) during parallel part of gc.");          \
    _promoInfo.promoted_oops_iterate##nv_suffix(blk);                         \
    /*                                                                        \
     * This also restores any displaced headers and removes the elements from \
     * the iteration set as they are processed, so that we have a clean slate \
--- 1980,1999 ----
    _promoInfo.startTrackingPromotions();
  }
  
  bool CompactibleFreeListSpace::no_allocs_since_save_marks() {
    assert(_promoInfo.tracking(), "No preceding save_marks?");
!   assert(GenCollectedHeap::heap()->n_par_threads() == 0,
           "Shouldn't be called if using parallel gc.");
    return _promoInfo.noPromotions();
  }
  
  #define CFLS_OOP_SINCE_SAVE_MARKS_DEFN(OopClosureType, nv_suffix)           \
                                                                              \
  void CompactibleFreeListSpace::                                             \
  oop_since_save_marks_iterate##nv_suffix(OopClosureType* blk) {              \
!   assert(GenCollectedHeap::heap()->n_par_threads() == 0,                    \
           "Shouldn't be called (yet) during parallel part of gc.");          \
    _promoInfo.promoted_oops_iterate##nv_suffix(blk);                         \
    /*                                                                        \
     * This also restores any displaced headers and removes the elements from \
     * the iteration set as they are processed, so that we have a clean slate \