--- old/src/hotspot/share/runtime/heapMonitoring.hpp	2017-11-21 12:05:12.510579419 -0800
+++ new/src/hotspot/share/runtime/heapMonitoring.hpp	2017-11-21 12:05:12.198580491 -0800
@@ -48,10 +48,10 @@
   // This is the lrand64 generator.
   static inline uint64_t next_random(uint64_t rnd) {
     const uint64_t PrngMult = 0x5DEECE66DLL;
-    const uint64_t prng_add = 0xB;
-    const uint64_t prng_mod_power = 48;
-    const uint64_t prng_mod_mask = right_n_bits(prng_mod_power);
-    return (PrngMult * rnd + prng_add) & prng_mod_mask;
+    const uint64_t PrngAdd = 0xB;
+    const uint64_t PrngModPower = 48;
+    const uint64_t PrngModMask = right_n_bits(PrngModPower);
+    return (PrngMult * rnd + PrngAdd) & PrngModMask;
   }
 
   static inline double fast_log2(const double & d) {