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

8199604_cardtablemodrefbs_rename

*** 32,42 ****
  #include "oops/oop.inline.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "runtime/thread.inline.hpp"
  
  G1BarrierSet::G1BarrierSet(G1CardTable* card_table) :
!   CardTableModRefBS(card_table, BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)),
    _dcqs(JavaThread::dirty_card_queue_set())
  { }
  
  void G1BarrierSet::enqueue(oop pre_val) {
    // Nulls should have been already filtered.
--- 32,42 ----
  #include "oops/oop.inline.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "runtime/thread.inline.hpp"
  
  G1BarrierSet::G1BarrierSet(G1CardTable* card_table) :
!   CardTableBarrierSet(card_table, BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)),
    _dcqs(JavaThread::dirty_card_queue_set())
  { }
  
  void G1BarrierSet::enqueue(oop pre_val) {
    // Nulls should have been already filtered.
***************
*** 165,173 ****
    }
  }
  
  void G1BarrierSet::on_thread_detach(JavaThread* thread) {
    // Flush any deferred card marks, SATB buffers and dirty card queue buffers
!   CardTableModRefBS::on_thread_detach(thread);
    thread->satb_mark_queue().flush();
    thread->dirty_card_queue().flush();
  }
--- 165,173 ----
    }
  }
  
  void G1BarrierSet::on_thread_detach(JavaThread* thread) {
    // Flush any deferred card marks, SATB buffers and dirty card queue buffers
!   CardTableBarrierSet::on_thread_detach(thread);
    thread->satb_mark_queue().flush();
    thread->dirty_card_queue().flush();
  }