Skip to content

Commit

Permalink
Revert "New invariant for dlist (#7294)" (#7301)
Browse files Browse the repository at this point in the history
This reverts commit cf4d0e7.
  • Loading branch information
NikolajBjorner authored Jul 20, 2024
1 parent 80ac7b3 commit 5003d41
Showing 1 changed file with 9 additions and 17 deletions.
26 changes: 9 additions & 17 deletions src/util/dlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,23 +155,15 @@ class dll_base {
elem->init(elem);
}

bool invariant() const {
auto* e = this;
const T* slow = static_cast<const T*>(this);
const T* fast = m_next;
bool looped = false;
// m_next of each node should point back to m_prev of the following node,
// and m_prev of each node should point forward to m_next of the preceding node.
while (slow != fast) {
if (fast->m_prev->m_next != fast || fast->m_next->m_prev != fast)
return false;
fast = fast->m_next;
looped = looped || (fast == static_cast<const T*>(this));
if (!looped && fast == m_next)
// We should be able to traverse back to the starting node.
return false;
}
return true;
bool invariant() const {
auto* e = this;
do {
if (e->m_next->m_prev != e)
return false;
e = e->m_next;
}
while (e != this);
return true;
}

static bool contains(T const* list, T const* elem) {
Expand Down

0 comments on commit 5003d41

Please sign in to comment.