35 #include "oops/compressedOops.inline.hpp" |
35 #include "oops/compressedOops.inline.hpp" |
36 #include "oops/oop.inline.hpp" |
36 #include "oops/oop.inline.hpp" |
37 #include "runtime/mutexLocker.hpp" |
37 #include "runtime/mutexLocker.hpp" |
38 #include "runtime/thread.inline.hpp" |
38 #include "runtime/thread.inline.hpp" |
39 #include "utilities/macros.hpp" |
39 #include "utilities/macros.hpp" |
|
40 #ifdef COMPILER1 |
|
41 #include "gc/g1/c1/g1BarrierSetC1.hpp" |
|
42 #endif |
|
43 |
|
44 class G1BarrierSetC1; |
40 |
45 |
41 SATBMarkQueueSet G1BarrierSet::_satb_mark_queue_set; |
46 SATBMarkQueueSet G1BarrierSet::_satb_mark_queue_set; |
42 DirtyCardQueueSet G1BarrierSet::_dirty_card_queue_set; |
47 DirtyCardQueueSet G1BarrierSet::_dirty_card_queue_set; |
43 |
48 |
44 G1BarrierSet::G1BarrierSet(G1CardTable* card_table) : |
49 G1BarrierSet::G1BarrierSet(G1CardTable* card_table) : |
45 CardTableBarrierSet(make_barrier_set_assembler<G1BarrierSetAssembler>(), |
50 CardTableBarrierSet(make_barrier_set_assembler<G1BarrierSetAssembler>(), |
|
51 make_barrier_set_c1<G1BarrierSetC1>(), |
46 card_table, |
52 card_table, |
47 BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)) {} |
53 BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)) {} |
48 |
54 |
49 void G1BarrierSet::enqueue(oop pre_val) { |
55 void G1BarrierSet::enqueue(oop pre_val) { |
50 // Nulls should have been already filtered. |
56 // Nulls should have been already filtered. |