--- old/src/hotspot/share/gc/shared/barrierSetConfig.hpp	2018-06-08 19:45:21.025153438 +0200
+++ new/src/hotspot/share/gc/shared/barrierSetConfig.hpp	2018-06-08 19:45:20.758141854 +0200
@@ -30,7 +30,8 @@
 // Do something for each concrete barrier set part of the build.
 #define FOR_EACH_CONCRETE_BARRIER_SET_DO(f)          \
   f(CardTableBarrierSet)                             \
-  G1GC_ONLY(f(G1BarrierSet))
+  G1GC_ONLY(f(G1BarrierSet))                         \
+  ZGC_ONLY(f(ZBarrierSet))
 
 #define FOR_EACH_ABSTRACT_BARRIER_SET_DO(f)          \
   f(ModRef)