*** old/src/share/vm/gc/parallel/psMarkSweep.cpp	Wed Sep 16 15:18:33 2015
--- new/src/share/vm/gc/parallel/psMarkSweep.cpp	Wed Sep 16 15:18:33 2015

*** 187,208 ****
--- 187,212 ----
      size_t old_gen_prev_used = old_gen->used_in_bytes();
      size_t young_gen_prev_used = young_gen->used_in_bytes();
  
      allocate_stacks();
  
      COMPILER2_PRESENT(DerivedPointerTable::clear());
+ #if defined(COMPILER2) || INCLUDE_JVMCI
+     DerivedPointerTable::clear();
+ #endif
  
      ref_processor()->enable_discovery();
      ref_processor()->setup_policy(clear_all_softrefs);
  
      mark_sweep_phase1(clear_all_softrefs);
  
      mark_sweep_phase2();
  
+ #if defined(COMPILER2) || INCLUDE_JVMCI
      // Don't add any more derived pointers during phase3
!     COMPILER2_PRESENT(assert(DerivedPointerTable::is_active(), "Sanity"));
!     COMPILER2_PRESENT(DerivedPointerTable::set_active(false));
!     DerivedPointerTable::set_active(false);
+ #endif
  
      mark_sweep_phase3();
  
      mark_sweep_phase4();
  

*** 243,253 ****
--- 247,259 ----
  
      BiasedLocking::restore_marks();
      CodeCache::gc_epilogue();
      JvmtiExport::gc_epilogue();
  
      COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
+ #if defined(COMPILER2) || INCLUDE_JVMCI
+     DerivedPointerTable::update_pointers();
+ #endif
  
      ref_processor()->enqueue_discovered_references(NULL);
  
      // Update time of last GC
      reset_millis_since_last_gc();