diff -r 6ce12ce00d3e -r 990b1fed3b47 src/hotspot/share/memory/metaspace/blockListArray.hpp
--- a/src/hotspot/share/memory/metaspace/blockListArray.hpp	Sat Nov 23 11:05:16 2019 +0100
+++ b/src/hotspot/share/memory/metaspace/blockListArray.hpp	Mon Nov 25 16:35:14 2019 +0100
@@ -47,7 +47,7 @@
 
 // A bitmap keeping track of which list is occupied. Smallest list corresponds to lowest order bit.
 // 1 means list is not empty, 0 means list is empty.
-class BlockListFreeMap {
+class BlockListArrayMask {
 
   typedef uint32_t mask_type;
   mask_type _mask;
@@ -56,7 +56,7 @@
 
 public:
 
-  BlockListFreeMap() : _mask(0) {}
+  BlockListArrayMask() : _mask(0) {}
 
   bool all_zero() const          { return _mask == 0; }
 
@@ -83,7 +83,7 @@
 
   block_t* _bins[num_bins];
 
-  BlockListFreeMap _map;
+  BlockListArrayMask _map;
 
   // e.g. spread = 4
   //
@@ -126,7 +126,7 @@
 public:
 
   BlockListArray() : _map() {
-    assert(BlockListFreeMap::size() >= num_bins, "Map too small.");
+    assert(BlockListArrayMask::size() >= num_bins, "Map too small.");
     ::memset(_bins, 0, sizeof(_bins));
   }