--- a/src/hotspot/share/runtime/frame.cpp	Mon Nov 06 20:29:49 2017 -0800
+++ b/src/hotspot/share/runtime/frame.cpp	Mon Nov 06 21:28:03 2017 -0800
@@ -1148,7 +1148,7 @@
       // make sure we have the right receiver type
     }
   }
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
   assert(DerivedPointerTable::is_empty(), "must be empty before verify");
 #endif
   oops_do_internal(&VerifyOopClosure::verify_oop, NULL, (RegisterMap*)map, false);