--- old/src/hotspot/share/utilities/bitMap.hpp	2019-11-28 16:53:39.745008488 -0500
+++ new/src/hotspot/share/utilities/bitMap.hpp	2019-11-28 16:53:39.520996456 -0500
@@ -63,7 +63,8 @@
   bm_word_t* _map;     // First word in bitmap
   idx_t      _size;    // Size of bitmap (in bits)
 
-  // Limit max_size_in_bits so aligning up to a word never overflows.
+  // The maximum allowable size of a bitmap, in words or bits.
+  // Limit max_size_in_bits so aligning up to a word boundary never overflows.
   static idx_t max_size_in_words() { return raw_to_words_align_down(~idx_t(0)); }
   static idx_t max_size_in_bits() { return max_size_in_words() * BitsPerWord; }
 
@@ -158,11 +159,11 @@
 
   // Verification.
 
-  // Verify size_in_bits does not exceed maximum size.
+  // Verify size_in_bits does not exceed max_size_in_bits().
   static void verify_size(idx_t size_in_bits) NOT_DEBUG_RETURN;
-  // Verify bit is less than size.
+  // Verify bit is less than size().
   void verify_index(idx_t bit) const NOT_DEBUG_RETURN;
-  // Verify bit is not greater than size.
+  // Verify bit is not greater than size().
   void verify_limit(idx_t bit) const NOT_DEBUG_RETURN;
   // Verify [beg,end) is a valid range, e.g. beg <= end <= size().
   void verify_range(idx_t beg, idx_t end) const NOT_DEBUG_RETURN;
--- old/src/hotspot/share/utilities/bitMap.inline.hpp	2019-11-28 16:53:40.689059196 -0500
+++ new/src/hotspot/share/utilities/bitMap.inline.hpp	2019-11-28 16:53:40.433045445 -0500
@@ -26,7 +26,6 @@
 #define SHARE_UTILITIES_BITMAP_INLINE_HPP
 
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/count_trailing_zeros.hpp"