--- old/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	2018-10-18 14:45:38.498910876 +0200
+++ new/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	2018-10-18 14:45:38.221898982 +0200
@@ -46,6 +46,7 @@
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/collectorPolicy.hpp"
+#include "gc/shared/fill.hpp"
 #include "gc/shared/gcLocker.hpp"
 #include "gc/shared/gcPolicyCounters.hpp"
 #include "gc/shared/gcTimer.hpp"
@@ -207,7 +208,7 @@
 ConcurrentMarkSweepGeneration::ConcurrentMarkSweepGeneration(
      ReservedSpace rs, size_t initial_byte_size, CardTableRS* ct) :
   CardGeneration(rs, initial_byte_size, ct),
-  _dilatation_factor(((double)MinChunkSize)/((double)(CollectedHeap::min_fill_size()))),
+  _dilatation_factor(((double)MinChunkSize)/((double)(Fill::min_size()))),
   _did_compact(false)
 {
   HeapWord* bottom = (HeapWord*) _virtual_space.low();
@@ -254,7 +255,7 @@
   // promoting generation, we'll instead just use the minimum
   // object size (which today is a header's worth of space);
   // note that all arithmetic is in units of HeapWords.
-  assert(MinChunkSize >= CollectedHeap::min_fill_size(), "just checking");
+  assert(MinChunkSize >= Fill::min_size(), "just checking");
   assert(_dilatation_factor >= 1.0, "from previous assert");
 }