--- a/src/hotspot/share/runtime/arguments.cpp	Mon Nov 06 20:29:49 2017 -0800
+++ b/src/hotspot/share/runtime/arguments.cpp	Mon Nov 06 21:28:03 2017 -0800
@@ -1860,7 +1860,7 @@
 #endif
   select_gc();
 
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
   // Shared spaces work fine with other GCs but causes bytecode rewriting
   // to be disabled, which hurts interpreter performance and decreases
   // server performance.  When -server is specified, keep the default off