--- old/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	2018-04-12 10:20:24.812133831 +0200
+++ new/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	2018-04-12 10:20:24.603124804 +0200
@@ -1542,7 +1542,7 @@
   G1BarrierSet* bs = new G1BarrierSet(ct);
   bs->initialize();
   assert(bs->is_a(BarrierSet::G1BarrierSet), "sanity");
-  set_barrier_set(bs);
+  BarrierSet::set_barrier_set(bs);
   _card_table = ct;
 
   // Create the hot card cache.