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

*** 49,58 ****
--- 49,59 ----
  #include "gc/shared/gcTrace.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
  #include "gc/shared/referencePolicy.hpp"
  #include "gc/shared/referenceProcessor.hpp"
+ #include "gc/shared/softRefPolicy.hpp"
  #include "gc/shared/spaceDecorator.hpp"
  #include "gc/shared/weakProcessor.hpp"
  #include "logging/log.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/instanceKlass.inline.hpp"
*** 1705,1715 ****
    if (ScavengeBeforeFullGC) {
      PSScavenge::invoke_no_policy();
    }
  
    const bool clear_all_soft_refs =
!     heap->collector_policy()->should_clear_all_soft_refs();
  
    PSParallelCompact::invoke_no_policy(clear_all_soft_refs ||
                                        maximum_heap_compaction);
  }
  
--- 1706,1716 ----
    if (ScavengeBeforeFullGC) {
      PSScavenge::invoke_no_policy();
    }
  
    const bool clear_all_soft_refs =
!     heap->soft_ref_policy()->should_clear_all_soft_refs();
  
    PSParallelCompact::invoke_no_policy(clear_all_soft_refs ||
                                        maximum_heap_compaction);
  }
  
*** 1737,1749 ****
    PSYoungGen* young_gen = heap->young_gen();
    PSOldGen* old_gen = heap->old_gen();
    PSAdaptiveSizePolicy* size_policy = heap->size_policy();
  
    // The scope of casr should end after code that can change
!   // CollectorPolicy::_should_clear_all_soft_refs.
    ClearedAllSoftRefs casr(maximum_heap_compaction,
!                           heap->collector_policy());
  
    if (ZapUnusedHeapArea) {
      // Save information needed to minimize mangling
      heap->record_gen_tops_before_GC();
    }
--- 1738,1750 ----
    PSYoungGen* young_gen = heap->young_gen();
    PSOldGen* old_gen = heap->old_gen();
    PSAdaptiveSizePolicy* size_policy = heap->size_policy();
  
    // The scope of casr should end after code that can change
!   // SoftRefPolicy::_should_clear_all_soft_refs.
    ClearedAllSoftRefs casr(maximum_heap_compaction,
!                           heap->soft_ref_policy());
  
    if (ZapUnusedHeapArea) {
      // Save information needed to minimize mangling
      heap->record_gen_tops_before_GC();
    }
*** 1867,1877 ****
                                               eden_live,
                                               max_old_gen_size,
                                               max_eden_size,
                                               true /* full gc*/,
                                               gc_cause,
!                                              heap->collector_policy());
  
          size_policy->decay_supplemental_growth(true /* full gc*/);
  
          heap->resize_old_gen(
            size_policy->calculated_old_free_size_in_bytes());
--- 1868,1878 ----
                                               eden_live,
                                               max_old_gen_size,
                                               max_eden_size,
                                               true /* full gc*/,
                                               gc_cause,
!                                              heap->soft_ref_policy());
  
          size_policy->decay_supplemental_growth(true /* full gc*/);
  
          heap->resize_old_gen(
            size_policy->calculated_old_free_size_in_bytes());