From 2e7e357355d238593399ac964dceebe36b4ef336 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Fri, 11 Oct 2024 23:47:32 -0700 Subject: [PATCH] Remove dead code --- ConflictSet.cpp | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/ConflictSet.cpp b/ConflictSet.cpp index 619b6fc..d55b38c 100644 --- a/ConflictSet.cpp +++ b/ConflictSet.cpp @@ -3372,9 +3372,8 @@ PRESERVE_NONE void done_common_prefix_iter(CheckJob *job, MUSTTAIL return complete(job, context); } - // This makes it safe to check maxVersion within checkRangeLeftSide. If this - // were false, then we would have returned above since lcp == begin.size(). - assert(!(job->n->parent == nullptr && job->begin.size() == 0)); + // If this were not true we would have returned above + assert(job->begin.size() > 0); if (!checkRangeStartsWith(job->n, job->begin.subspan(0, job->lcp), job->begin[job->lcp], job->end[job->lcp], @@ -3387,43 +3386,15 @@ PRESERVE_NONE void done_common_prefix_iter(CheckJob *job, job->searchPathLen = 0; job->prefixLen = job->lcp + 1; - if (job->remaining.size() == 0) { - assert(job->searchPathLen >= job->prefixLen); - if (maxVersion(job->n) > job->readVersion) { - job->setResult(false); - MUSTTAIL return complete(job, context); - } else { - job->continuation = done_left_side_iter; - MUSTTAIL return job->continuation(job, context); - } - } - - if (job->searchPathLen >= job->prefixLen) { - if (!checkMaxBetweenExclusive(job->n, job->remaining[0], 256, - job->readVersion, context->tls)) { - job->setResult(false); - MUSTTAIL return complete(job, context); - } - } - auto c = getChild(job->n, job->remaining[0]); Node *child = c; if (child == nullptr) { auto c = getChildGeq(job->n, job->remaining[0]); if (c != nullptr) { - if (job->searchPathLen < job->prefixLen) { - job->n = c; - job->continuation = left_side_down_left_spine; - __builtin_prefetch(job->n); - MUSTTAIL return keepGoing(job, context); - } job->n = c; - if (maxVersion(job->n) > job->readVersion) { - job->setResult(false); - MUSTTAIL return complete(job, context); - } - job->continuation = done_left_side_iter; - MUSTTAIL return job->continuation(job, context); + job->continuation = left_side_down_left_spine; + __builtin_prefetch(job->n); + MUSTTAIL return keepGoing(job, context); } else { job->n = nextSibling(job->n); if (job->n == nullptr) {