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

*** 2577,2587 ****
    g1_rem_set()->print_periodic_summary_info("After GC RS summary", total_collections() - 1);
  
    // 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;
  
    double start = os::elapsedTime();
--- 2577,2587 ----
    g1_rem_set()->print_periodic_summary_info("After GC RS summary", total_collections() - 1);
  
    // FIXME: what is this about?
    // I'm ignoring the "fill_newgen()" call if "alloc_event_enabled"
    // is set.
! #if COMPILER2_OR_JVMCI
    assert(DerivedPointerTable::is_empty(), "derived pointer present");
  #endif
    // always_do_update_barrier = true;
  
    double start = os::elapsedTime();
*** 2990,3000 ****
  
        _verifier->verify_before_gc();
  
        _verifier->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
--- 2990,3000 ----
  
        _verifier->verify_before_gc();
  
        _verifier->check_bitmaps("GC Start");
  
! #if COMPILER2_OR_JVMCI
        DerivedPointerTable::clear();
  #endif
  
        // Please see comment in g1CollectedHeap.hpp and
        // G1CollectedHeap::ref_processing_init() to see how
*** 4419,4429 ****
    _hot_card_cache->set_use_cache(true);
  
    purge_code_root_memory();
  
    redirty_logged_cards();
! #if defined(COMPILER2) || INCLUDE_JVMCI
    double start = os::elapsedTime();
    DerivedPointerTable::update_pointers();
    g1_policy()->phase_times()->record_derived_pointer_table_update_time((os::elapsedTime() - start) * 1000.0);
  #endif
    g1_policy()->print_age_table();
--- 4419,4429 ----
    _hot_card_cache->set_use_cache(true);
  
    purge_code_root_memory();
  
    redirty_logged_cards();
! #if COMPILER2_OR_JVMCI
    double start = os::elapsedTime();
    DerivedPointerTable::update_pointers();
    g1_policy()->phase_times()->record_derived_pointer_table_update_time((os::elapsedTime() - start) * 1000.0);
  #endif
    g1_policy()->print_age_table();