src/hotspot/share/gc/shared/vmGCOperations.cpp

*** 36,49 ****
  #include "runtime/handles.inline.hpp"
  #include "runtime/init.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/preserveException.hpp"
! #if INCLUDE_ALL_GCS
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1Policy.hpp"
! #endif // INCLUDE_ALL_GCS
  
  VM_GC_Operation::~VM_GC_Operation() {
    CollectedHeap* ch = Universe::heap();
    ch->soft_ref_policy()->set_all_soft_refs_clear(false);
  }
--- 36,49 ----
  #include "runtime/handles.inline.hpp"
  #include "runtime/init.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/preserveException.hpp"
! #if INCLUDE_G1GC
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1Policy.hpp"
! #endif // INCLUDE_G1GC
  
  VM_GC_Operation::~VM_GC_Operation() {
    CollectedHeap* ch = Universe::heap();
    ch->soft_ref_policy()->set_all_soft_refs_clear(false);
  }
*** 191,206 ****
    AllocTracer::send_allocation_requiring_gc_event(_size * HeapWordSize, GCId::peek());
  }
  
  // Returns true iff concurrent GCs unloads metadata.
  bool VM_CollectForMetadataAllocation::initiate_concurrent_GC() {
! #if INCLUDE_ALL_GCS
    if (UseConcMarkSweepGC && CMSClassUnloadingEnabled) {
      MetaspaceGC::set_should_concurrent_collect(true);
      return true;
    }
  
    if (UseG1GC && ClassUnloadingWithConcurrentMark) {
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
      g1h->g1_policy()->collector_state()->set_initiate_conc_mark_if_possible(true);
  
      GCCauseSetter x(g1h, _gc_cause);
--- 191,208 ----
    AllocTracer::send_allocation_requiring_gc_event(_size * HeapWordSize, GCId::peek());
  }
  
  // Returns true iff concurrent GCs unloads metadata.
  bool VM_CollectForMetadataAllocation::initiate_concurrent_GC() {
! #if INCLUDE_CMSGC
    if (UseConcMarkSweepGC && CMSClassUnloadingEnabled) {
      MetaspaceGC::set_should_concurrent_collect(true);
      return true;
    }
+ #endif
  
+ #if INCLUDE_G1GC
    if (UseG1GC && ClassUnloadingWithConcurrentMark) {
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
      g1h->g1_policy()->collector_state()->set_initiate_conc_mark_if_possible(true);
  
      GCCauseSetter x(g1h, _gc_cause);