--- old/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp	2019-11-14 15:57:33.605631279 +0100
+++ new/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp	2019-11-14 15:57:33.264620391 +0100
@@ -1611,7 +1611,7 @@
     // we utilize all the worker threads we can.
     bool processing_is_mt = rp->processing_is_mt();
     uint active_workers = (processing_is_mt ? _g1h->workers()->active_workers() : 1U);
-    active_workers = MAX2(MIN2(active_workers, _max_num_tasks), 1U);
+    active_workers = clamp(active_workers, 1u, _max_num_tasks);
 
     // Parallel processing task executor.
     G1CMRefProcTaskExecutor par_task_executor(_g1h, this,