--- old/src/hotspot/share/opto/classes.hpp	2018-06-06 00:41:11.845893582 +0200
+++ new/src/hotspot/share/opto/classes.hpp	2018-06-06 00:41:11.590882601 +0200
@@ -22,6 +22,8 @@
  *
  */
 
+#include "utilities/macros.hpp"
+
 // The giant table of Node classes.
 // One entry per class, sorted by class name.
 
@@ -186,6 +188,14 @@
 macro(LoadN)
 macro(LoadRange)
 macro(LoadS)
+#if INCLUDE_ZGC
+#define zgcmacro(x) macro(x)
+#else
+#define zgcmacro(x) optionalmacro(x)
+#endif
+zgcmacro(LoadBarrier)
+zgcmacro(LoadBarrierSlowReg)
+zgcmacro(LoadBarrierWeakSlowReg)
 macro(Lock)
 macro(Loop)
 macro(LoopLimit)