--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -73,7 +73,7 @@
card_table->initialize();
CardTableBarrierSet* const barrier_set = new CardTableBarrierSet(card_table);
barrier_set->initialize();
- set_barrier_set(barrier_set);
+ BarrierSet::set_barrier_set(barrier_set);
// Make up the generations
// Calculate the maximum size that a generation can grow. This
@@ -627,7 +627,7 @@
}
CardTableBarrierSet* ParallelScavengeHeap::barrier_set() {
- return barrier_set_cast<CardTableBarrierSet>(CollectedHeap::barrier_set());
+ return barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
}
PSCardTable* ParallelScavengeHeap::card_table() {