--- old/src/hotspot/share/runtime/rframe.cpp	2017-10-30 04:05:39.990846387 -0700
+++ new/src/hotspot/share/runtime/rframe.cpp	2017-10-30 04:05:39.641814001 -0700
@@ -155,7 +155,7 @@
 
 void RFrame::print(const char* kind) {
 #ifndef PRODUCT
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
   int cnt = top_method()->interpreter_invocation_count();
 #else
   int cnt = top_method()->invocation_count();