Automatic merge of jdk:master into master

Author: duke

src/hotspot/share/opto/indexSet.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -241,7 +241,7 @@ IndexSet::IndexSet (IndexSet *set) {
       set_block(i, &_empty_block);
     } else {
       BitBlock *new_block = alloc_block();
-      memcpy(new_block->words(), block->words(), sizeof(uint32_t) * words_per_block);
+      memcpy(new_block->words(), block->words(), sizeof(uintptr_t) * words_per_block);
       set_block(i, new_block);
     }
   }

src/hotspot/share/opto/indexSet.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,9 +60,12 @@ class IndexSet : public ResourceObj {
   // membership of the element in the set.
 
   // The lengths of the index bitfields
-  enum { bit_index_length = 5,
-         word_index_length = 3,
-         block_index_length = 8 // not used
+  enum {
+         // Each block consists of 256 bits
+         block_index_length = 8,
+         // Split over 4 or 8 words depending on bitness
+         word_index_length  = block_index_length - LogBitsPerWord,
+         bit_index_length   = block_index_length - word_index_length,
   };
 
   // Derived constants used for manipulating the index bitfields
@@ -88,7 +91,7 @@ class IndexSet : public ResourceObj {
     return mask_bits(element >> word_index_offset,word_index_mask);
   }
   static uint get_bit_index(uint element) {
-    return mask_bits(element,bit_index_mask);
+    return mask_bits(element, bit_index_mask);
   }
 
   //------------------------------ class BitBlock ----------------------------
@@ -102,17 +105,17 @@ class IndexSet : public ResourceObj {
     // All of BitBlocks fields and methods are declared private.  We limit
     // access to IndexSet and IndexSetIterator.
 
-    // A BitBlock is composed of some number of 32 bit words.  When a BitBlock
+    // A BitBlock is composed of some number of 32- or 64-bit words.  When a BitBlock
     // is not in use by any IndexSet, it is stored on a free list.  The next field
-    // is used by IndexSet to mainting this free list.
+    // is used by IndexSet to maintain this free list.
 
     union {
-      uint32_t _words[words_per_block];
+      uintptr_t _words[words_per_block];
       BitBlock *_next;
     } _data;
 
     // accessors
-    uint32_t* words() { return _data._words; }
+    uintptr_t* words() { return _data._words; }
     void set_next(BitBlock *next) { _data._next = next; }
     BitBlock *next() { return _data._next; }
 
@@ -121,32 +124,32 @@ class IndexSet : public ResourceObj {
     // not assume that the block index has been masked out.
 
     void clear() {
-      memset(words(), 0, sizeof(uint32_t) * words_per_block);
+      memset(words(), 0, sizeof(uintptr_t) * words_per_block);
     }
 
     bool member(uint element) {
       uint word_index = IndexSet::get_word_index(element);
-      uint bit_index = IndexSet::get_bit_index(element);
+      uintptr_t bit_index = IndexSet::get_bit_index(element);
 
-      return ((words()[word_index] & (uint32_t)(0x1 << bit_index)) != 0);
+      return ((words()[word_index] & (uintptr_t(1) << bit_index)) != 0);
     }
 
     bool insert(uint element) {
       uint word_index = IndexSet::get_word_index(element);
-      uint bit_index = IndexSet::get_bit_index(element);
+      uintptr_t bit_index = IndexSet::get_bit_index(element);
 
-      uint32_t bit = (0x1 << bit_index);
-      uint32_t before = words()[word_index];
+      uintptr_t bit = uintptr_t(1) << bit_index;
+      uintptr_t before = words()[word_index];
       words()[word_index] = before | bit;
       return ((before & bit) != 0);
     }
 
     bool remove(uint element) {
       uint word_index = IndexSet::get_word_index(element);
-      uint bit_index = IndexSet::get_bit_index(element);
+      uintptr_t bit_index = IndexSet::get_bit_index(element);
 
-      uint32_t bit = (0x1 << bit_index);
-      uint32_t before = words()[word_index];
+      uintptr_t bit = uintptr_t(1) << bit_index;
+      uintptr_t before = words()[word_index];
       words()[word_index] = before & ~bit;
       return ((before & bit) != 0);
     }
@@ -376,7 +379,7 @@ class IndexSetIterator {
 
  private:
   // The current word we are inspecting
-  uint32_t              _current;
+  uintptr_t             _current;
 
   // What element number are we currently on?
   uint                  _value;
@@ -391,7 +394,7 @@ class IndexSetIterator {
   uint                  _max_blocks;
 
   // A pointer to the contents of the current block
-  uint32_t             *_words;
+  uintptr_t*            _words;
 
   // A pointer to the blocks in our set
   IndexSet::BitBlock **_blocks;
@@ -447,7 +450,7 @@ class IndexSetIterator {
 
   // Return the next element of the set.
   uint next_value() {
-    uint current = _current;
+    uintptr_t current = _current;
     assert(current != 0, "sanity");
     uint advance = count_trailing_zeros(current);
     assert(((current >> advance) & 0x1) == 1, "sanity");