src/hotspot/share/gc/shared/cardTableBarrierSet.cpp

rename things

8198949_arraycopy

*** 21,30 ****
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "gc/shared/cardTableBarrierSetAssembler.hpp"
  #include "gc/shared/cardTableBarrierSet.inline.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "logging/log.hpp"
***************
*** 37,56 ****
  
  // This kind of "BarrierSet" allows a "CollectedHeap" to detect and
  // enumerate ref fields that have been modified (since the last
  // enumeration.)
  
! CardTableBarrierSet::CardTableBarrierSet(
!   CardTable* card_table,
!   const BarrierSet::FakeRtti& fake_rtti) :
!   ModRefBarrierSet(fake_rtti.add_tag(BarrierSet::CardTableBarrierSet)),
    _defer_initial_card_mark(false),
    _card_table(card_table)
  {}
  
  CardTableBarrierSet::CardTableBarrierSet(CardTable* card_table) :
!   ModRefBarrierSet(BarrierSet::FakeRtti(BarrierSet::CardTableBarrierSet)),
    _defer_initial_card_mark(false),
    _card_table(card_table)
  {}
  
  void CardTableBarrierSet::initialize() {
--- 38,59 ----
  
  // This kind of "BarrierSet" allows a "CollectedHeap" to detect and
  // enumerate ref fields that have been modified (since the last
  // enumeration.)
  
! CardTableBarrierSet::CardTableBarrierSet(BarrierSetAssembler* barrier_set_assembler,
!                                          CardTable* card_table,
!                                          const BarrierSet::FakeRtti& fake_rtti) :
!   ModRefBarrierSet(barrier_set_assembler,
!                    fake_rtti.add_tag(BarrierSet::CardTableBarrierSet)),
    _defer_initial_card_mark(false),
    _card_table(card_table)
  {}
  
  CardTableBarrierSet::CardTableBarrierSet(CardTable* card_table) :
!   ModRefBarrierSet(make_barrier_set_assembler<CardTableBarrierSetAssembler>(),
!                    BarrierSet::FakeRtti(BarrierSet::CardTableBarrierSet)),
    _defer_initial_card_mark(false),
    _card_table(card_table)
  {}
  
  void CardTableBarrierSet::initialize() {