src/share/vm/gc/g1/g1CollectedHeap.cpp

*** 1505,1515 ****
        verify_before_gc();
  
        check_bitmaps("Full GC Start");
        pre_full_gc_dump(gc_timer);
  
!       COMPILER2_PRESENT(DerivedPointerTable::clear());
  
        // Disable discovery and empty the discovered lists
        // for the CM ref processor.
        ref_processor_cm()->disable_discovery();
        ref_processor_cm()->abandon_partial_discovery();
--- 1505,1517 ----
        verify_before_gc();
  
        check_bitmaps("Full GC Start");
        pre_full_gc_dump(gc_timer);
  
! #if defined(COMPILER2) || INCLUDE_JVMCI
!       DerivedPointerTable::clear();
! #endif
  
        // Disable discovery and empty the discovered lists
        // for the CM ref processor.
        ref_processor_cm()->disable_discovery();
        ref_processor_cm()->abandon_partial_discovery();
*** 1565,1575 ****
  
        // Enqueue any discovered reference objects that have
        // not been removed from the discovered lists.
        ref_processor_stw()->enqueue_discovered_references();
  
!       COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
  
        MemoryService::track_memory_usage();
  
        assert(!ref_processor_stw()->discovery_enabled(), "Postcondition");
        ref_processor_stw()->verify_no_references_recorded();
--- 1567,1579 ----
  
        // Enqueue any discovered reference objects that have
        // not been removed from the discovered lists.
        ref_processor_stw()->enqueue_discovered_references();
  
! #if defined(COMPILER2) || INCLUDE_JVMCI
!       DerivedPointerTable::update_pointers();
! #endif
  
        MemoryService::track_memory_usage();
  
        assert(!ref_processor_stw()->discovery_enabled(), "Postcondition");
        ref_processor_stw()->verify_no_references_recorded();
*** 3628,3639 ****
    }
  
    // FIXME: what is this about?
    // I'm ignoring the "fill_newgen()" call if "alloc_event_enabled"
    // is set.
!   COMPILER2_PRESENT(assert(DerivedPointerTable::is_empty(),
!                         "derived pointer present"));
    // always_do_update_barrier = true;
  
    resize_all_tlabs();
    allocation_context_stats().update(full);
  
--- 3632,3644 ----
    }
  
    // FIXME: what is this about?
    // I'm ignoring the "fill_newgen()" call if "alloc_event_enabled"
    // is set.
! #if defined(COMPILER2) || INCLUDE_JVMCI
!   assert(DerivedPointerTable::is_empty(), "derived pointer present");
! #endif
    // always_do_update_barrier = true;
  
    resize_all_tlabs();
    allocation_context_stats().update(full);
  
*** 4035,4045 ****
  
        verify_before_gc();
  
        check_bitmaps("GC Start");
  
!       COMPILER2_PRESENT(DerivedPointerTable::clear());
  
        // Please see comment in g1CollectedHeap.hpp and
        // G1CollectedHeap::ref_processing_init() to see how
        // reference processing currently works in G1.
  
--- 4040,4052 ----
  
        verify_before_gc();
  
        check_bitmaps("GC Start");
  
! #if defined(COMPILER2) || INCLUDE_JVMCI
!       DerivedPointerTable::clear();
! #endif
  
        // Please see comment in g1CollectedHeap.hpp and
        // G1CollectedHeap::ref_processing_init() to see how
        // reference processing currently works in G1.
  
*** 5664,5674 ****
    // cards). We need these updates logged to update any
    // RSets.
    enqueue_discovered_references(per_thread_states);
  
    redirty_logged_cards();
!   COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
  }
  
  void G1CollectedHeap::record_obj_copy_mem_stats() {
    _gc_tracer_stw->report_evacuation_statistics(create_g1_evac_summary(&_survivor_evac_stats),
                                                 create_g1_evac_summary(&_old_evac_stats));
--- 5671,5683 ----
    // cards). We need these updates logged to update any
    // RSets.
    enqueue_discovered_references(per_thread_states);
  
    redirty_logged_cards();
! #if defined(COMPILER2) || INCLUDE_JVMCI
!   DerivedPointerTable::update_pointers();
! #endif
  }
  
  void G1CollectedHeap::record_obj_copy_mem_stats() {
    _gc_tracer_stw->report_evacuation_statistics(create_g1_evac_summary(&_survivor_evac_stats),
                                                 create_g1_evac_summary(&_old_evac_stats));