--- old/src/hotspot/share/runtime/heapMonitoring.hpp	2017-10-31 13:44:24.563654738 -0700
+++ new/src/hotspot/share/runtime/heapMonitoring.hpp	2017-10-31 13:44:24.195656209 -0700
@@ -40,7 +40,6 @@
   static const int FastLogNumBits = 10;
   static const int FastLogMask = (1 << FastLogNumBits) - 1;
   static double _log_table[1<<FastLogNumBits];  // Constant
-  static AlwaysTrueClosure _always_true;
 
   static void pick_next_sample(JavaThread *t);
 
@@ -51,8 +50,7 @@
     const uint64_t PrngMult = 0x5DEECE66DLL;
     const uint64_t prng_add = 0xB;
     const uint64_t prng_mod_power = 48;
-    const uint64_t prng_mod_mask =
-        ~((~static_cast<uint64_t>(0)) << prng_mod_power);
+    const uint64_t prng_mod_mask = right_n_bits(prng_mod_power);
     return (PrngMult * rnd + prng_add) & prng_mod_mask;
   }
 
@@ -96,6 +94,7 @@
   // but which no longer have other references in the heap.
   static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure *f);
   static void weak_oops_do(OopClosure* oop_closure) {
+    AlwaysTrueClosure _always_true;
     weak_oops_do(&_always_true, oop_closure);
   }