src/share/vm/gc/parallel/psParallelCompact.cpp

*** 1043,1053 ****
    MetaspaceAux::verify_metrics();
  
    CodeCache::gc_epilogue();
    JvmtiExport::gc_epilogue();
  
!   COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
  
    ref_processor()->enqueue_discovered_references(NULL);
  
    if (ZapUnusedHeapArea) {
      heap->gen_mangle_unused_area();
--- 1043,1055 ----
    MetaspaceAux::verify_metrics();
  
    CodeCache::gc_epilogue();
    JvmtiExport::gc_epilogue();
  
! #if defined(COMPILER2) || INCLUDE_JVMCI
!   DerivedPointerTable::update_pointers();
! #endif
  
    ref_processor()->enqueue_discovered_references(NULL);
  
    if (ZapUnusedHeapArea) {
      heap->gen_mangle_unused_area();
*** 2040,2050 ****
      // Let the size policy know we're starting
      size_policy->major_collection_begin();
  
      CodeCache::gc_prologue();
  
!     COMPILER2_PRESENT(DerivedPointerTable::clear());
  
      ref_processor()->enable_discovery();
      ref_processor()->setup_policy(maximum_heap_compaction);
  
      bool marked_for_unloading = false;
--- 2042,2054 ----
      // Let the size policy know we're starting
      size_policy->major_collection_begin();
  
      CodeCache::gc_prologue();
  
! #if defined(COMPILER2) || INCLUDE_JVMCI
!     DerivedPointerTable::clear();
! #endif
  
      ref_processor()->enable_discovery();
      ref_processor()->setup_policy(maximum_heap_compaction);
  
      bool marked_for_unloading = false;
*** 2054,2065 ****
  
      bool max_on_system_gc = UseMaximumCompactionOnSystemGC
        && GCCause::is_user_requested_gc(gc_cause);
      summary_phase(vmthread_cm, maximum_heap_compaction || max_on_system_gc);
  
!     COMPILER2_PRESENT(assert(DerivedPointerTable::is_active(), "Sanity"));
!     COMPILER2_PRESENT(DerivedPointerTable::set_active(false));
  
      // adjust_roots() updates Universe::_intArrayKlassObj which is
      // needed by the compaction for filling holes in the dense prefix.
      adjust_roots();
  
--- 2058,2071 ----
  
      bool max_on_system_gc = UseMaximumCompactionOnSystemGC
        && GCCause::is_user_requested_gc(gc_cause);
      summary_phase(vmthread_cm, maximum_heap_compaction || max_on_system_gc);
  
! #if defined(COMPILER2) || INCLUDE_JVMCI
!     assert(DerivedPointerTable::is_active(), "Sanity");
!     DerivedPointerTable::set_active(false);
! #endif
  
      // adjust_roots() updates Universe::_intArrayKlassObj which is
      // needed by the compaction for filling holes in the dense prefix.
      adjust_roots();