Merge pull request #62781 from kateinoigakukun/pr-1c50f837dff8c45e643bd7cc67d17b9ad80e3f43

stdlib: repair 32bit non-Darwin build for TypeLayout

Author: swift-ci

stdlib/toolchain/CompatibilityBytecodeLayouts/BytecodeLayouts.cpp

@@ -75,6 +75,14 @@ size_t BitVector::count() const {
   return total;
 }
 
+void BitVector::addPointer(uintptr_t byte) {
+#if __POINTER_WIDTH__ == 64
+  add((uint64_t)byte);
+#else
+  add((uint32_t)byte);
+#endif
+}
+
 void BitVector::add(uint64_t byte) {
   for (size_t i = 0; i < 64; i++)
     data.push_back(byte >> (63 - i) & 0x1);
@@ -391,7 +399,7 @@ BitVector MultiPayloadEnum::spareBits() const {
 
 static BitVector pointerSpareBitMask() {
   BitVector bv;
-  bv.add(heap_object_abi::SwiftSpareBitsMask);
+  bv.addPointer(heap_object_abi::SwiftSpareBitsMask);
   return bv;
 }
 

stdlib/toolchain/CompatibilityBytecodeLayouts/BytecodeLayouts.h

@@ -159,6 +159,9 @@ struct BitVector {
   /// Append on a 64bit value
   void add(uint64_t values);
 
+  /// Append on a pointer-size value
+  void addPointer(uintptr_t values);
+
   /// Append on a vector of bytes
   void add(std::vector<uint8_t> values);