diff options
| -rw-r--r-- | include/llvm/ADT/DenseMap.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/llvm/ADT/DenseMap.h b/include/llvm/ADT/DenseMap.h index ce07f8e9c5..ac4bdbd126 100644 --- a/include/llvm/ADT/DenseMap.h +++ b/include/llvm/ADT/DenseMap.h @@ -600,8 +600,7 @@ public: unsigned OldNumBuckets = NumBuckets; BucketT *OldBuckets = Buckets; - AtLeast = isPowerOf2_32(AtLeast) ? AtLeast : NextPowerOf2(AtLeast); - allocateBuckets(std::max<unsigned>(64, AtLeast)); + allocateBuckets(std::max<unsigned>(64, NextPowerOf2(AtLeast-1))); assert(Buckets); if (!OldBuckets) { this->BaseT::initEmpty(); @@ -827,10 +826,8 @@ public: } void grow(unsigned AtLeast) { - if (AtLeast >= InlineBuckets) { - AtLeast = isPowerOf2_32(AtLeast) ? AtLeast : NextPowerOf2(AtLeast); - AtLeast = std::max<unsigned>(64, AtLeast); - } + if (AtLeast >= InlineBuckets) + AtLeast = std::max<unsigned>(64, NextPowerOf2(AtLeast-1)); if (Small) { if (AtLeast < InlineBuckets) |