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

BarrierSetC2

*** 32,56 ****
--- 32,62 ----
  #include "gc/g1/satbMarkQueue.hpp"
  #include "logging/log.hpp"
  #include "oops/access.inline.hpp"
  #include "oops/compressedOops.inline.hpp"
  #include "oops/oop.inline.hpp"
+ #include "runtime/interfaceSupport.inline.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "runtime/thread.inline.hpp"
  #include "utilities/macros.hpp"
  #ifdef COMPILER1
  #include "gc/g1/c1/g1BarrierSetC1.hpp"
  #endif
+ #ifdef COMPILER2
+ #include "gc/g1/c2/g1BarrierSetC2.hpp"
+ #endif
  
  class G1BarrierSetC1;
+ class G1BarrierSetC2;
  
  SATBMarkQueueSet G1BarrierSet::_satb_mark_queue_set;
  DirtyCardQueueSet G1BarrierSet::_dirty_card_queue_set;
  
  G1BarrierSet::G1BarrierSet(G1CardTable* card_table) :
    CardTableBarrierSet(make_barrier_set_assembler<G1BarrierSetAssembler>(),
                        make_barrier_set_c1<G1BarrierSetC1>(),
+                       make_barrier_set_c2<G1BarrierSetC2>(),
                        card_table,
                        BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)) {}
  
  void G1BarrierSet::enqueue(oop pre_val) {
    // Nulls should have been already filtered.