--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp Mon Nov 06 20:29:49 2017 -0800
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp Mon Nov 06 21:28:03 2017 -0800
@@ -1032,7 +1032,7 @@
CodeCache::gc_epilogue();
JvmtiExport::gc_epilogue();
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
@@ -1783,7 +1783,7 @@
CodeCache::gc_prologue();
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
@@ -1799,7 +1799,7 @@
&& GCCause::is_user_requested_gc(gc_cause);
summary_phase(vmthread_cm, maximum_heap_compaction || max_on_system_gc);
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
assert(DerivedPointerTable::is_active(), "Sanity");
DerivedPointerTable::set_active(false);
#endif