--- old/src/hotspot/share/opto/parse2.cpp	2019-11-14 15:57:45.366006776 +0100
+++ new/src/hotspot/share/opto/parse2.cpp	2019-11-14 15:57:45.020995760 +0100
@@ -605,7 +605,7 @@
     return PROB_FAIR;
   }
   float p = taken_cnt / total_cnt;
-  return MIN2(MAX2(p, PROB_MIN), PROB_MAX);
+  return clamp(p, PROB_MIN, PROB_MAX);
 }
 
 static float if_cnt(float cnt) {