--- old/src/hotspot/share/opto/opcodes.cpp	2018-06-08 19:45:34.359731977 +0200
+++ new/src/hotspot/share/opto/opcodes.cpp	2018-06-08 19:45:34.079719828 +0200
@@ -28,6 +28,7 @@
 // Build a table of class names as strings.  Used both for debugging printouts
 // and in the ADL machine descriptions.
 #define macro(x) #x,
+#define optionalmacro(x) macro(x)
 const char *NodeClassNames[] = {
   "Node",
   "Set",
@@ -48,3 +49,4 @@
   "_last_class_name",
 };
 #undef macro
+#undef optionalmacro