--- old/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	2018-05-02 11:08:16.759737927 +0200
+++ new/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp	2018-05-02 11:08:16.471729093 +0200
@@ -290,7 +290,7 @@
   if (_ref_processor == NULL) {
     // Allocate and initialize a reference processor
     _ref_processor =
-      new ReferenceProcessor(&_span_discoverer,                      // span
+      new ReferenceProcessor(&_span_based_discoverer,
                              (ParallelGCThreads > 1) && ParallelRefProcEnabled, // mt processing
                              ParallelGCThreads,                      // mt processing degree
                              _cmsGen->refs_discovery_is_mt(),        // mt discovery
@@ -448,7 +448,7 @@
   // Adjust span to cover old (cms) gen
   _span(cmsGen->reserved()),
   _ct(ct),
-  _span_discoverer(_span),
+  _span_based_discoverer(_span),
   _ref_processor(NULL),    // will be set later
   _conc_workers(NULL),     // may be set later
   _abort_preclean(false),
@@ -3761,7 +3761,7 @@
   // referents.
   if (clean_refs) {
     CMSPrecleanRefsYieldClosure yield_cl(this);
-    assert(_span_discoverer.span().equals(_span), "Spans should be equal");
+    assert(_span_based_discoverer.span().equals(_span), "Spans should be equal");
     CMSKeepAliveClosure keep_alive(this, _span, &_markBitMap,
                                    &_markStack, true /* preclean */);
     CMSDrainMarkingStackClosure complete_trace(this,
@@ -5174,7 +5174,7 @@
   HandleMark   hm;
 
   ReferenceProcessor* rp = ref_processor();
-  assert(_span_discoverer.span().equals(_span), "Spans should be equal");
+  assert(_span_based_discoverer.span().equals(_span), "Spans should be equal");
   assert(!rp->enqueuing_is_done(), "Enqueuing should not be complete");
   // Process weak references.
   rp->setup_policy(false);