diff -r 9fe9292f5931 -r 1772ebf07d1f src/hotspot/share/gc/serial/genMarkSweep.cpp
--- a/src/hotspot/share/gc/serial/genMarkSweep.cpp	Mon Nov 06 20:29:49 2017 -0800
+++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp	Mon Nov 06 21:28:03 2017 -0800
@@ -92,7 +92,7 @@
   mark_sweep_phase2();
 
   // Don't add any more derived pointers during phase3
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
   assert(DerivedPointerTable::is_active(), "Sanity");
   DerivedPointerTable::set_active(false);
 #endif