--- old/src/hotspot/share/gc/parallel/psScavenge.cpp	2017-10-30 04:05:31.780084520 -0700
+++ new/src/hotspot/share/gc/parallel/psScavenge.cpp	2017-10-30 04:05:31.421051205 -0700
@@ -331,7 +331,7 @@
 
     save_to_space_top_before_gc();
 
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
     DerivedPointerTable::clear();
 #endif
 
@@ -601,7 +601,7 @@
       assert(young_gen->to_space()->is_empty(), "to space should be empty now");
     }
 
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
     DerivedPointerTable::update_pointers();
 #endif