--- old/src/hotspot/share/runtime/arguments.cpp	2017-10-30 04:05:36.170491901 -0700
+++ new/src/hotspot/share/runtime/arguments.cpp	2017-10-30 04:05:35.819459329 -0700
@@ -1859,7 +1859,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