Remove switch on phase from Stepwise left/right step

ConflictSet.cpp

@@ -2001,11 +2001,7 @@ struct CheckRangeLeftSide {
   int searchPathLen = 0;
   bool ok;
 
-  enum Phase { Search, DownLeftSpine } phase = Search;
-
   bool step() {
-    switch (phase) {
-    case Search: {
     if (maxVersion(n, impl) <= readVersion) {
       ok = true;
       return true;
@@ -2050,8 +2046,7 @@ struct CheckRangeLeftSide {
 
     if (n->partialKeyLen > 0) {
       int commonLen = std::min<int>(n->partialKeyLen, remaining.size());
-        int i =
+      int i = longestCommonPrefix(n->partialKey(), remaining.data(), commonLen);
-            longestCommonPrefix(n->partialKey(), remaining.data(), commonLen);
       searchPathLen += i;
       if (i < commonLen) {
         auto c = n->partialKey()[i] <=> remaining[i];
@@ -2076,8 +2071,7 @@ struct CheckRangeLeftSide {
       }
       if (commonLen == n->partialKeyLen) {
         // partial key matches
-          remaining =
+        remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
-              remaining.subspan(commonLen, remaining.size() - commonLen);
       } else if (n->partialKeyLen > int(remaining.size())) {
         assert(searchPathLen >= prefixLen);
         if (n->entryPresent && n->entry.rangeVersion > readVersion) {
@@ -2088,9 +2082,11 @@ struct CheckRangeLeftSide {
         return true;
       }
     }
-      break;
+    return false;
   }
-    case DownLeftSpine: {
+
+  bool downLeftSpine() {
+    for (;;) {
       if (n->entryPresent) {
         ok = n->entry.rangeVersion <= readVersion;
         return true;
@@ -2098,16 +2094,7 @@ struct CheckRangeLeftSide {
       int c = getChildGeq(n, 0);
       assert(c >= 0);
       n = getChildExists(n, c);
-    } break;
-    default:                   // GCOVR_EXCL_LINE
-      __builtin_unreachable(); // GCOVR_EXCL_LINE
     }
-    return false;
-  }
-
-  bool downLeftSpine() {
-    phase = DownLeftSpine;
-    return false;
   }
 };
 
@@ -2134,15 +2121,11 @@ struct CheckRangeRightSide {
   int searchPathLen = 0;
   bool ok;
 
-  enum Phase { Search, DownLeftSpine } phase = Search;
-
   bool step() {
-    switch (phase) {
-    case Search: {
 #if DEBUG_VERBOSE && !defined(NDEBUG)
-      fprintf(
+    fprintf(stderr,
-          stderr,
+            "Search path: %s, searchPathLen: %d, prefixLen: %d, remaining: "
-          "Search path: %s, searchPathLen: %d, prefixLen: %d, remaining: %s\n",
+            "%s\n",
             getSearchPathPrintable(n).c_str(), searchPathLen, prefixLen,
             printable(remaining).c_str());
 #endif
@@ -2188,8 +2171,7 @@ struct CheckRangeRightSide {
 
     if (n->partialKeyLen > 0) {
       int commonLen = std::min<int>(n->partialKeyLen, remaining.size());
-        int i =
+      int i = longestCommonPrefix(n->partialKey(), remaining.data(), commonLen);
-            longestCommonPrefix(n->partialKey(), remaining.data(), commonLen);
       searchPathLen += i;
       if (i < commonLen) {
         ++searchPathLen;
@@ -2207,25 +2189,11 @@ struct CheckRangeRightSide {
       }
       if (commonLen == n->partialKeyLen) {
         // partial key matches
-          remaining =
+        remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
-              remaining.subspan(commonLen, remaining.size() - commonLen);
       } else if (n->partialKeyLen > int(remaining.size())) {
         return downLeftSpine();
       }
     }
-    } break;
-    case DownLeftSpine: {
-      if (n->entryPresent) {
-        ok = n->entry.rangeVersion <= readVersion;
-        return true;
-      }
-      int c = getChildGeq(n, 0);
-      assert(c >= 0);
-      n = getChildExists(n, c);
-    } break;
-    default:                   // GCOVR_EXCL_LINE
-      __builtin_unreachable(); // GCOVR_EXCL_LINE
-    }
     return false;
   }
 
@@ -2253,9 +2221,15 @@ struct CheckRangeRightSide {
   }
 
   bool downLeftSpine() {
-    phase = DownLeftSpine;
+    for (;;) {
-    assert(n != nullptr);
+      if (n->entryPresent) {
-    return false;
+        ok = n->entry.rangeVersion <= readVersion;
+        return true;
+      }
+      int c = getChildGeq(n, 0);
+      assert(c >= 0);
+      n = getChildExists(n, c);
+    }
   }
 };