Allow writeVersion, oldestVersion, and readVersion to span 2e9

ConflictSet.cpp

@@ -3155,6 +3155,7 @@ void internal_addWrites(ConflictSet::Impl *impl,
 
 void internal_setOldestVersion(ConflictSet::Impl *impl, int64_t oldestVersion) {
   mallocBytesDelta = 0;
+  assert(oldestVersion >= impl->oldestVersionFullPrecision);
   impl->setOldestVersion(oldestVersion);
   impl->totalBytes += mallocBytesDelta;
 #if SHOW_MEMORY

Internal.h

@@ -518,7 +518,7 @@ struct ReferenceImpl {
   }
 
   void setOldestVersion(int64_t oldestVersion) {
-    assert(oldestVersion >= oldestVersion);
+    assert(oldestVersion >= this->oldestVersion);
     this->oldestVersion = oldestVersion;
   }
 
@@ -583,8 +583,8 @@ template <class ConflictSetImpl> struct TestDriver {
   explicit TestDriver(const uint8_t *data, size_t size)
       : arbitrary({data, size}) {}
 
-  int64_t oldestVersion = 0;
+  int64_t oldestVersion = arbitrary.next();
-  int64_t writeVersion = 0;
+  int64_t writeVersion = oldestVersion;
   ConflictSetImpl cs{oldestVersion};
   ReferenceImpl refImpl{oldestVersion};
 
@@ -606,9 +606,8 @@ template <class ConflictSetImpl> struct TestDriver {
     {
       int numPointWrites = arbitrary.bounded(100);
       int numRangeWrites = arbitrary.bounded(100);
-      int64_t v =
+      int64_t v = (writeVersion += arbitrary.bounded(10) ? arbitrary.bounded(10)
-          (writeVersion += arbitrary.bounded(10) == 0 ? arbitrary.bounded(10)
+                                                         : arbitrary.next());
-                                                      : arbitrary.next());
       auto *writes =
           new (arena) ConflictSet::WriteRange[numPointWrites + numRangeWrites];
       auto keys = set<std::string_view>(arena);
@@ -671,15 +670,20 @@ template <class ConflictSetImpl> struct TestDriver {
 
       refImpl.addWrites(writes, numPointWrites + numRangeWrites, v);
 
-      oldestVersion =
+      oldestVersion +=
-          std::min(writeVersion - 10, oldestVersion + arbitrary.bounded(10));
+          arbitrary.bounded(10) ? arbitrary.bounded(10) : arbitrary.next();
+      oldestVersion = std::min(oldestVersion, writeVersion);
       cs.setOldestVersion(oldestVersion);
       refImpl.setOldestVersion(oldestVersion);
     }
     {
       int numPointReads = arbitrary.bounded(100);
       int numRangeReads = arbitrary.bounded(100);
-      int64_t v = std::max<int64_t>(writeVersion - arbitrary.bounded(10), 0);
+
+      int64_t v = std::max<int64_t>(writeVersion - (arbitrary.bounded(10)
+                                                        ? arbitrary.bounded(10)
+                                                        : arbitrary.next()),
+                                    0);
       auto *reads =
           new (arena) ConflictSet::ReadRange[numPointReads + numRangeReads];
       auto keys = set<std::string_view>(arena);

SkipList.cpp

@@ -634,9 +634,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
   }
 
   void setOldestVersion(int64_t oldestVersion) {
-    if (oldestVersion < this->oldestVersion) {
+    assert(oldestVersion >= this->oldestVersion);
-      return;
-    }
     this->oldestVersion = oldestVersion;
     SkipList::Finger finger;
     int temp;

corpus/0e410d4488defd877d2c9690a26970f57ab78b0c

@@ -0,0 +1,4 @@
+*
+
+
+

corpus/22c23c2418773edaaff055ed387f82c8ad078f9f

@@ -0,0 +1,2 @@
+*
+