From cb4c2b7e1e07552ce408b7b423b491eb5b98d9d4 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew@weaselab.dev>
Date: Tue, 19 Mar 2024 14:29:13 -0700
Subject: [PATCH] Avoid redundant null check in some cases

---
 ConflictSet.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ConflictSet.cpp b/ConflictSet.cpp
index 6b46756..e9ef973 100644
--- a/ConflictSet.cpp
+++ b/ConflictSet.cpp
@@ -1540,6 +1540,9 @@ bool checkPointRead(Node *n, const std::span<const uint8_t> key,
         goto downLeftSpine;
       } else {
         n = nextSibling(n);
+        if (n == nullptr) {
+          return true;
+        }
         goto downLeftSpine;
       }
     }
@@ -1556,6 +1559,9 @@ bool checkPointRead(Node *n, const std::span<const uint8_t> key,
           goto downLeftSpine;
         } else {
           n = nextSibling(n);
+          if (n == nullptr) {
+            return true;
+          }
           goto downLeftSpine;
         }
       }
@@ -1570,9 +1576,6 @@ bool checkPointRead(Node *n, const std::span<const uint8_t> key,
     }
   }
 downLeftSpine:
-  if (n == nullptr) {
-    return true;
-  }
   for (;;) {
     if (n->entryPresent) {
       return n->entry.rangeVersion <= readVersion;