Merge branch 'master' of github.com:kentonv/capnproto

c++/src/capnp/layout.c++

@@ -1609,6 +1609,7 @@ struct WireHelpers {
       return { segment, ptr };
     } else {
       // List of structs.
+      KJ_DASSERT(value.structDataSize % BITS_PER_WORD == 0 * BITS);
       word* ptr = allocate(ref, segment, capTable, totalSize + POINTER_SIZE_IN_WORDS,
                            WirePointer::LIST, orphanArena);
       ref->listRef.setInlineComposite(totalSize);

c++/src/capnp/layout.h

@@ -643,7 +643,8 @@ class ListBuilder: public kj::DisallowConstCopy {
 public:
   inline explicit ListBuilder(ElementSize elementSize)
       : segment(nullptr), capTable(nullptr), ptr(nullptr), elementCount(0 * ELEMENTS),
-        step(0 * BITS / ELEMENTS), elementSize(elementSize) {}
+        step(0 * BITS / ELEMENTS), elementSize(elementSize), structDataSize(0 * BITS),
+        structPointerCount(0 * POINTERS) {}
 
   MSVC_DEFAULT_ASSIGNMENT_WORKAROUND(, ListBuilder)
 

c++/src/kj/vector.h

@@ -103,6 +103,22 @@ public:
     }
   }
 
+  inline void operator=(decltype(nullptr)) {
+    builder = nullptr;
+  }
+
+  inline void clear() {
+    while (builder.size() > 0) {
+      builder.removeLast();
+    }
+  }
+
+  inline void truncate(size_t size) {
+    while (builder.size() > size) {
+      builder.removeLast();
+    }
+  }
+
 private:
   ArrayBuilder<T> builder;