weaselab/conflict-set
2
0
Fork 0
Code Issues 4 Packages Releases 13 Activity

Don't assign to nextRangeWrite twice

Browse Source
This commit is contained in:
Andrew Noyes
2024-10-30 15:33:40 -07:00
parent c4b0aa1085
commit 0df09743da
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ConflictSet.cpp
View File

@@ -4949,7 +4949,6 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
lastRangeWrite->nextRangeWrite = context.results + i; lastRangeWrite->nextRangeWrite = context.results + i;
} }
lastRangeWrite = context.results + i; lastRangeWrite = context.results + i;
lastRangeWrite->nextRangeWrite = nullptr;
while (context.results[i].endInsertionPoint->releaseDeferred) { while (context.results[i].endInsertionPoint->releaseDeferred) {
context.results[i].endInsertionPoint = context.results[i].endInsertionPoint =
context.results[i].endInsertionPoint->forwardTo; context.results[i].endInsertionPoint->forwardTo;
@@ -4962,6 +4961,9 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
context.results[i].endInsertionPoint = endNode; context.results[i].endInsertionPoint = endNode;
} }
} }
if (firstRangeWrite != nullptr) {
lastRangeWrite->nextRangeWrite = nullptr;
}
// Phase 3: Erase nodes within written ranges. Going left to right ensures // Phase 3: Erase nodes within written ranges. Going left to right ensures
// that nothing later is on the search path of anything earlier, so we don't // that nothing later is on the search path of anything earlier, so we don't