--- old/src/hotspot/share/gc/g1/g1BarrierSet.cpp	2018-11-04 19:00:05.968212720 -0500
+++ new/src/hotspot/share/gc/g1/g1BarrierSet.cpp	2018-11-04 19:00:05.700198617 -0500
@@ -55,6 +55,8 @@
                       make_barrier_set_c2<G1BarrierSetC2>(),
                       card_table,
                       BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)),
+  _satb_mark_queue_buffer_allocator(G1SATBBufferSize, SATB_Q_FL_lock),
+  _dirty_card_queue_buffer_allocator(G1UpdateBufferSize, DirtyCardQ_FL_lock),
   _satb_mark_queue_set(),
   _dirty_card_queue_set()
 {}
@@ -202,3 +204,11 @@
   G1ThreadLocalData::satb_mark_queue(thread).flush();
   G1ThreadLocalData::dirty_card_queue(thread).flush();
 }
+
+BufferNode::Allocator& G1BarrierSet::satb_mark_queue_buffer_allocator() {
+  return _satb_mark_queue_buffer_allocator;
+}
+
+BufferNode::Allocator& G1BarrierSet::dirty_card_queue_buffer_allocator() {
+  return _dirty_card_queue_buffer_allocator;
+}