--- old/src/hotspot/share/opto/opcodes.hpp	2018-06-08 19:45:34.725747857 +0200
+++ new/src/hotspot/share/opto/opcodes.hpp	2018-06-08 19:45:34.447735795 +0200
@@ -27,6 +27,7 @@
 
 // Build a big enum of class names to give them dense integer indices
 #define macro(x) Op_##x,
+#define optionalmacro(x) macro(x)
 enum Opcodes {
   Op_Node = 0,
   macro(Set)                    // Instruction selection match rule
@@ -47,6 +48,7 @@
   _last_opcode
 };
 #undef macro
+#undef optionalmacro
 
 // Table of names, indexed by Opcode
 extern const char *NodeClassNames[];