commit a228a48d5ec4aa14cb416598f0fd9860d994f6c6
author Michael Ludwig <michaelludwig@google.com> Wed Aug 25 12:26:17 2021 -0400
committer Michael Ludwig <michaelludwig@google.com> Wed Aug 25 18:34:17 2021 +0000
tree 86d234d3fb1c2e784241b77250fefdf6a9a809e8
parent 3e87a8eda968a4a149f9339827f7045dda8707b8

Silence clang-tidy warnings around SkBlockAllocator

Change-Id: I4a825c0d191f3f24d558c4331e07fe2a55832f76
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441838
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/core/SkBlockAllocator.cpp

diff --git a/src/core/SkBlockAllocator.cpp b/src/core/SkBlockAllocator.cpp
index 4c32476..35de576 100644
--- a/src/core/SkBlockAllocator.cpp
+++ b/src/core/SkBlockAllocator.cpp
@@ -194,8 +194,8 @@
     }
 }
 
-void SkBlockAllocator::addBlock(int minimumSize, int maxSize) {
-    SkASSERT(minimumSize > (int) sizeof(Block) && minimumSize <= maxSize);
+void SkBlockAllocator::addBlock(int minSize, int maxSize) {
+    SkASSERT(minSize > (int) sizeof(Block) && minSize <= maxSize);
 
     // Max positive value for uint:23 storage (decltype(fN0) picks up uint64_t, not uint:23).
     static constexpr int kMaxN = (1 << 23) - 1;
@@ -211,13 +211,13 @@
 
     int allocSize;
     void* mem = nullptr;
-    if (this->scratchBlockSize() >= minimumSize) {
+    if (this->scratchBlockSize() >= minSize) {
         // Activate the scratch block instead of making a new block
         SkASSERT(fHead.fPrev->isScratch());
         allocSize = fHead.fPrev->fSize;
         mem = fHead.fPrev;
         fHead.fPrev = nullptr;
-    } else if (minimumSize < maxSize) {
+    } else if (minSize < maxSize) {
         // Calculate the 'next' size per growth policy sequence
         GrowthPolicy gp = static_cast<GrowthPolicy>(fGrowthPolicy);
         int nextN1 = fN0 + fN1;
@@ -241,13 +241,13 @@
             // maxSize will be sufficient for the requested minimumSize
             allocSize = maxSize;
         } else {
-            allocSize = std::min(alignAllocSize(std::max(minimumSize, sizeIncrement * nextN1)),
+            allocSize = std::min(alignAllocSize(std::max(minSize, sizeIncrement * nextN1)),
                                  maxSize);
         }
     } else {
-        SkASSERT(minimumSize == maxSize);
+        SkASSERT(minSize == maxSize);
         // Still align on a nice boundary, no max clamping since that would just undo the alignment
-        allocSize = alignAllocSize(minimumSize);
+        allocSize = alignAllocSize(minSize);
     }
 
     // Create new block and append to the linked list of blocks in this allocator
@@ -284,7 +284,7 @@
         prev = block;
     }
     SkASSERT(prev == fTail);
-    SkASSERT(blocks.size() > 0);
+    SkASSERT(!blocks.empty());
     SkASSERT(blocks[0] == &fHead);
 
     // Confirm reverse iteration matches forward iteration

tests/SkBlockAllocatorTest.cpp

diff --git a/tests/SkBlockAllocatorTest.cpp b/tests/SkBlockAllocatorTest.cpp
index 4b87606..973d9c1 100644
--- a/tests/SkBlockAllocatorTest.cpp
+++ b/tests/SkBlockAllocatorTest.cpp
@@ -270,6 +270,7 @@
     SkDEBUGCODE(pool->validate();)
 
     std::vector<SkBlockAllocator::ByteRange> ptrs;
+    ptrs.reserve(32); // silence clang-tidy performance warning
     for (int i = 0; i < 32; ++i) {
         ptrs.push_back(pool->allocate<4>(16));
     }