From 3634b6a59b2720aa90ac3718a2324a404e5d836b Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Sat, 17 Aug 2024 14:28:36 -0700 Subject: [PATCH] Simplify slightly in checkMaxBetweenExclusive --- ConflictSet.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ConflictSet.cpp b/ConflictSet.cpp index 16a7348..ee09ed7 100644 --- a/ConflictSet.cpp +++ b/ConflictSet.cpp @@ -2340,10 +2340,8 @@ bool checkMaxBetweenExclusiveImpl(Node *n, int begin, int end, int c = self->bitSet.firstSetGeq(begin + 1); if (c >= 0 && c < end) { auto *child = self->children[self->index[c]]; - if (child->entryPresent) { - if (!(child->entry.rangeVersion <= readVersion)) { - return false; - }; + if (child->entryPresent && child->entry.rangeVersion > readVersion) { + return false; } begin = c; } else { @@ -2376,10 +2374,8 @@ bool checkMaxBetweenExclusiveImpl(Node *n, int begin, int end, int c = self->bitSet.firstSetGeq(begin + 1); if (c >= 0 && c < end) { auto *child = self->children[c]; - if (child->entryPresent) { - if (!(child->entry.rangeVersion <= readVersion)) { - return false; - }; + if (child->entryPresent && child->entry.rangeVersion > readVersion) { + return false; } begin = c; } else { @@ -2422,9 +2418,7 @@ bool checkMaxBetweenExclusiveImpl(Node *n, int begin, int end, } } // Check inner pages - const int innerPageBegin = (begin >> Node256::kMaxOfMaxShift) + 1; - const int innerPageEnd = (end - 1) >> Node256::kMaxOfMaxShift; - return scan16(self->maxOfMax, innerPageBegin, innerPageEnd, + return scan16(self->maxOfMax, firstPage + 1, lastPage, readVersion); } default: // GCOVR_EXCL_LINE