--- old/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp	2018-04-16 13:05:21.111581207 +0200
+++ new/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp	2018-04-16 13:05:20.827572498 +0200
@@ -153,11 +153,11 @@
 }
 
 inline bool G1ParScanThreadState::needs_partial_trimming() const {
-  return !_refs->overflow_empty() || _refs->size() > _stack_drain_upper_threshold;
+  return !_refs->overflow_empty() || _refs->size() > _stack_trim_upper_threshold;
 }
 
 inline bool G1ParScanThreadState::is_partially_trimmed() const {
-  return _refs->overflow_empty() && _refs->size() <= _stack_drain_lower_threshold;
+  return _refs->overflow_empty() && _refs->size() <= _stack_trim_lower_threshold;
 }
 
 inline void G1ParScanThreadState::trim_queue_to_threshold(uint threshold) {
@@ -181,7 +181,7 @@
 
   const Ticks start = Ticks::now();
   do {
-    trim_queue_to_threshold(_stack_drain_lower_threshold);
+    trim_queue_to_threshold(_stack_trim_lower_threshold);
   } while (!is_partially_trimmed());
   _trim_ticks += Ticks::now() - start;
 }