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

*** 349,359 ****
--- 349,361 ----
      } else if (ZapUnusedHeapArea) {
        young_gen->to_space()->mangle_unused_area();
      }
      save_to_space_top_before_gc();
  
      COMPILER2_PRESENT(DerivedPointerTable::clear());
+ #if defined(COMPILER2) || INCLUDE_JVMCI
+     DerivedPointerTable::clear();
+ #endif
  
      reference_processor()->enable_discovery();
      reference_processor()->setup_policy(false);
  
      // We track how much was promoted to the next generation for

*** 621,631 ****
--- 623,635 ----
        heap->resize_all_tlabs();
  
        assert(young_gen->to_space()->is_empty(), "to space should be empty now");
      }
  
      COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
+ #if defined(COMPILER2) || INCLUDE_JVMCI
+     DerivedPointerTable::update_pointers();
+ #endif
  
      NOT_PRODUCT(reference_processor()->verify_no_references_recorded());
  
      {
        GCTraceTime tm("Prune Scavenge Root Methods", false, false, &_gc_timer, _gc_tracer.gc_id());