*** old/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Fri Mar 29 17:26:13 2019
--- new/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Fri Mar 29 17:26:12 2019

*** 77,89 ****
--- 77,86 ----
  #include "gc/shared/suspendibleThreadSet.hpp"
  #include "gc/shared/referenceProcessor.inline.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "gc/shared/weakProcessor.inline.hpp"
  #include "gc/shared/workerPolicy.hpp"
  #if INCLUDE_JVMCI
  #include "jvmci/jvmci.hpp"
  #endif
  #include "logging/log.hpp"
  #include "memory/allocation.hpp"
  #include "memory/iterator.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/access.inline.hpp"

*** 3275,3288 ****
--- 3272,3281 ----
  void G1CollectedHeap::complete_cleaning(BoolObjectClosure* is_alive,
                                          bool class_unloading_occurred) {
    uint num_workers = workers()->active_workers();
    ParallelCleaningTask unlink_task(is_alive, num_workers, class_unloading_occurred, false);
    workers()->run_task(&unlink_task);
  #if INCLUDE_JVMCI
    // No parallel processing of JVMCI metadata handles for now.
    JVMCI::do_unloading(is_alive, class_unloading_occurred);
  #endif
  }
  
  // Clean string dedup data structures.
  // Ideally we would prefer to use a StringDedupCleaningTask here, but we want to
  // record the durations of the phases. Hence the almost-copy.