Simplify slightly in checkMaxBetweenExclusive

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<kAVX512>(self->maxOfMax, innerPageBegin, innerPageEnd,
+    return scan16<kAVX512>(self->maxOfMax, firstPage + 1, lastPage,
                            readVersion);
   }
   default:                   // GCOVR_EXCL_LINE
@@ -2927,7 +2921,6 @@ void eraseTree(Node *root, WriteContext *tls) {
     tls->accum.entries_erased += n->entryPresent;
     ++tls->accum.nodes_released;
 
-    removeNode(n);
     removeKey(n);
 
     switch (n->getType()) {