From 02866a8cae343da2d1573b4cdeb85afe83f2ff0d Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Wed, 26 Jun 2024 20:55:18 -0700 Subject: [PATCH] Save some bounds checking for scanning Node256 --- ConflictSet.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ConflictSet.cpp b/ConflictSet.cpp index 685eb0c..36821b4 100644 --- a/ConflictSet.cpp +++ b/ConflictSet.cpp @@ -1762,10 +1762,9 @@ bool checkMaxBetweenExclusive(Node *n, int begin, int end, } // Check inner pages bool result = true; - for (int i = 1; i < Node256::kMaxOfMaxTotalPages - 1; ++i) { - result &= !((self->maxOfMax[i] > readVersion) & - ((begin >> Node256::kMaxOfMaxShift) + 1 <= i) & - (i < ((end - 1) >> Node256::kMaxOfMaxShift))); + for (int i = (begin >> Node256::kMaxOfMaxShift) + 1; + i < ((end - 1) >> Node256::kMaxOfMaxShift); ++i) { + result &= self->maxOfMax[i] <= readVersion; } return result; }