src/hotspot/share/gc/g1/g1RemSet.cpp

*** 22,31 ****
--- 22,32 ----
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/dirtyCardQueue.hpp"
+ #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1BlockOffsetTable.inline.hpp"
  #include "gc/g1/g1CardTable.inline.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1ConcurrentRefine.hpp"
  #include "gc/g1/g1FromCardCache.hpp"
*** 486,496 ****
    update_rem_set(pss, worker_i);
    scan_rem_set(pss, heap_region_codeblobs, worker_i);;
  }
  
  void G1RemSet::prepare_for_oops_into_collection_set_do() {
!   DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
    dcqs.concatenate_logs();
  
    _scan_state->reset();
  }
  
--- 487,497 ----
    update_rem_set(pss, worker_i);
    scan_rem_set(pss, heap_region_codeblobs, worker_i);;
  }
  
  void G1RemSet::prepare_for_oops_into_collection_set_do() {
!   DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set();
    dcqs.concatenate_logs();
  
    _scan_state->reset();
  }
  
*** 639,649 ****
      if (*card_ptr != G1CardTable::dirty_card_val()) {
        *card_ptr = G1CardTable::dirty_card_val();
        MutexLockerEx x(Shared_DirtyCardQ_lock,
                        Mutex::_no_safepoint_check_flag);
        DirtyCardQueue* sdcq =
!         JavaThread::dirty_card_queue_set().shared_dirty_card_queue();
        sdcq->enqueue(card_ptr);
      }
    } else {
      _num_conc_refined_cards++; // Unsynchronized update, only used for logging.
    }
--- 640,650 ----
      if (*card_ptr != G1CardTable::dirty_card_val()) {
        *card_ptr = G1CardTable::dirty_card_val();
        MutexLockerEx x(Shared_DirtyCardQ_lock,
                        Mutex::_no_safepoint_check_flag);
        DirtyCardQueue* sdcq =
!         G1BarrierSet::dirty_card_queue_set().shared_dirty_card_queue();
        sdcq->enqueue(card_ptr);
      }
    } else {
      _num_conc_refined_cards++; // Unsynchronized update, only used for logging.
    }