--- a/hotspot/src/share/vm/gc/serial/genMarkSweep.cpp	Thu Oct 15 13:28:22 2015 +0200
+++ b/hotspot/src/share/vm/gc/serial/genMarkSweep.cpp	Sat Oct 17 19:40:30 2015 -0400
@@ -96,8 +96,10 @@
   mark_sweep_phase2();
 
   // Don't add any more derived pointers during phase3
-  COMPILER2_PRESENT(assert(DerivedPointerTable::is_active(), "Sanity"));
-  COMPILER2_PRESENT(DerivedPointerTable::set_active(false));
+#if defined(COMPILER2) || INCLUDE_JVMCI
+  assert(DerivedPointerTable::is_active(), "Sanity");
+  DerivedPointerTable::set_active(false);
+#endif
 
   mark_sweep_phase3();