--- a/src/hotspot/share/gc/z/zBarrierSet.cpp Wed Aug 08 15:34:32 2018 -0700
+++ b/src/hotspot/share/gc/z/zBarrierSet.cpp Wed Aug 08 18:38:34 2018 -0700
@@ -22,8 +22,12 @@
*/
#include "precompiled.hpp"
+#ifdef COMPILER1
#include "gc/z/c1/zBarrierSetC1.hpp"
+#endif
+#ifdef COMPILER2
#include "gc/z/c2/zBarrierSetC2.hpp"
+#endif
#include "gc/z/zBarrierSet.hpp"
#include "gc/z/zBarrierSetAssembler.hpp"
#include "gc/z/zGlobals.hpp"
@@ -33,8 +37,8 @@
ZBarrierSet::ZBarrierSet() :
BarrierSet(make_barrier_set_assembler<ZBarrierSetAssembler>(),
- make_barrier_set_c1<ZBarrierSetC1>(),
- make_barrier_set_c2<ZBarrierSetC2>(),
+ COMPILER1_PRESENT( make_barrier_set_c1<ZBarrierSetC1>() ) NOT_COMPILER1(NULL),
+ COMPILER2_PRESENT( make_barrier_set_c2<ZBarrierSetC2>() ) NOT_COMPILER2(NULL),
BarrierSet::FakeRtti(BarrierSet::ZBarrierSet)) {}
ZBarrierSetAssembler* ZBarrierSet::assembler() {