diff -r c3a10df652c0 -r 93d84f667d12 src/hotspot/share/gc/shared/collectedHeap.cpp
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp	Thu Apr 12 08:25:30 2018 +0200
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp	Thu Apr 12 08:25:56 2018 +0200
@@ -313,7 +313,7 @@
 
 void CollectedHeap::set_barrier_set(BarrierSet* barrier_set) {
   _barrier_set = barrier_set;
-  BarrierSet::set_bs(barrier_set);
+  BarrierSet::set_barrier_set(barrier_set);
 }
 
 #ifndef PRODUCT