*** old/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp	Wed Sep 16 15:18:30 2015
--- new/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp	Wed Sep 16 15:18:30 2015

*** 2375,2385 ****
--- 2375,2387 ----
    // and traced those that need to be marked; moreover,
    // the marking done here is not going to interfere in any
    // way with the marking information used by GC.
    NoRefDiscovery no_discovery(ref_processor());
  
    COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
+ #if defined(COMPILER2) || INCLUDE_JVMCI
+   DerivedPointerTableDeactivate dpt_deact;
+ #endif
  
    // Clear any marks from a previous round
    verification_mark_bm()->clear_all();
    assert(verification_mark_stack()->isEmpty(), "markStack should be empty");
    verify_work_stacks_empty();

*** 3000,3010 ****
--- 3002,3014 ----
    if (CMSPrintEdenSurvivorChunks) {
      print_eden_and_survivor_chunk_arrays();
    }
  
    {
      COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
+ #if defined(COMPILER2) || INCLUDE_JVMCI
+     DerivedPointerTableDeactivate dpt_deact;
+ #endif
      if (CMSParallelInitialMarkEnabled) {
        // The parallel version.
        WorkGang* workers = gch->workers();
        assert(workers != NULL, "Need parallel worker threads.");
        uint n_workers = workers->active_workers();

*** 4329,4339 ****
--- 4333,4345 ----
    if (CMSPrintEdenSurvivorChunks) {
      print_eden_and_survivor_chunk_arrays();
    }
  
    {
      COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
+ #if defined(COMPILER2) || INCLUDE_JVMCI
+     DerivedPointerTableDeactivate dpt_deact;
+ #endif
  
      // Note on the role of the mod union table:
      // Since the marker in "markFromRoots" marks concurrently with
      // mutators, it is possible for some reachable objects not to have been
      // scanned. For instance, an only reference to an object A was