Cave in and just add the unreachable's gcc wants

We can allow larger capacities and still pay for the key bytes

ConflictSet.cpp

@@ -292,9 +292,10 @@ static_assert(kNode3Surplus >= kMinNodeSurplus);
 static_assert(kBytesPerKey - sizeof(Node0) >= kMinNodeSurplus);
 
 // setOldestVersion will additionally try to maintain this property:
-//     `max(children, 1) * length >= capacity`
+//     `(children + entryPresent) * length >= capacity`
 //
-// Which should give us the budget to pay for the key bytes
+// Which should give us the budget to pay for the key bytes. (children +
+// entryPresent) is a lower bound on how many keys these bytes are a prefix of
 
 template <class T, int64_t kMemoryBound = (1 << 20)>
 struct BoundedFreeListAllocator {
@@ -473,6 +474,7 @@ Node *&getChildExists(Node *self, uint8_t index) {
     return self256->children[index].child;
   }
   }
+  __builtin_unreachable(); // GCOVR_EXCL_LINE
 }
 
 // Precondition - an entry for index must exist in the node
@@ -504,6 +506,7 @@ Node *getChild(Node *self, uint8_t index) {
     return self256->children[index].child;
   }
   }
+  __builtin_unreachable(); // GCOVR_EXCL_LINE
 }
 
 template <class NodeT> int getChildGeqSimd(NodeT *self, int child) {
@@ -583,6 +586,7 @@ int getChildGeq(Node *self, int child) {
     return self48->bitSet.firstSetGeq(child);
   }
   }
+  __builtin_unreachable(); // GCOVR_EXCL_LINE
 }
 
 void setChildrenParents(Node3 *n) {
@@ -775,6 +779,7 @@ Node *&getOrCreateChild(Node *&self, uint8_t index,
     return self256->children[index].child;
   }
   }
+  __builtin_unreachable(); // GCOVR_EXCL_LINE
 }
 
 Node *nextPhysical(Node *node) {
@@ -802,7 +807,8 @@ Node *nextLogical(Node *node) {
 // Invalidates `self`, replacing it with a node of at least capacity.
 // Does not return nodes to freelists when kUseFreeList is false.
 template <bool kUseFreeList>
-void makeCapacityAtLeast(Node *&self, int capacity, NodeAllocators *allocators,
+void freeAndMakeCapacityAtLeast(Node *&self, int capacity,
+                                NodeAllocators *allocators,
                                 ConflictSet::Impl *impl) {
   switch (self->type) {
   case Type_Node0: {
@@ -910,12 +916,12 @@ void makeCapacityAtLeast(Node *&self, int capacity, NodeAllocators *allocators,
 void maybeDecreaseCapacity(Node *&self, NodeAllocators *allocators,
                            ConflictSet::Impl *impl) {
   const int maxCapacity =
-      std::max<int>(self->numChildren, 1) * self->partialKeyLen;
+      (self->numChildren + int(self->entryPresent)) * self->partialKeyLen;
   if (self->partialKeyCapacity <= maxCapacity) {
     return;
   }
-  makeCapacityAtLeast</*kUseFreeList*/ false>(self, maxCapacity, allocators,
+  freeAndMakeCapacityAtLeast</*kUseFreeList*/ false>(self, maxCapacity,
-                                              impl);
+                                                     allocators, impl);
 }
 
 // TODO fuse into erase child so we don't need to repeat branches on type
@@ -946,7 +952,7 @@ void maybeDownsize(Node *self, NodeAllocators *allocators,
 
         if (minCapacity > child->partialKeyCapacity) {
           const bool update = child == dontInvalidate;
-          makeCapacityAtLeast</*kUseFreeList*/ true>(child, minCapacity,
+          freeAndMakeCapacityAtLeast</*kUseFreeList*/ true>(child, minCapacity,
                                                             allocators, impl);
           if (update) {
             dontInvalidate = child;
@@ -2342,6 +2348,7 @@ int64_t &maxVersion(Node *n, ConflictSet::Impl *impl) {
     return n256->children[index].childMaxVersion;
   }
   }
+  __builtin_unreachable(); // GCOVR_EXCL_LINE
 }
 
 Node *&getInTree(Node *n, ConflictSet::Impl *impl) {