Runtime: Fix Windows build

Author: slavapestov

include/swift/ABI/Metadata.h

@@ -4878,6 +4878,8 @@ class TargetPackPointer {
   using PointerType = typename Runtime::template Pointer<const Pointee<Runtime>>;
 
 public:
+  explicit TargetPackPointer(typename Runtime::StoredSize rawPtr) : Ptr(rawPtr) {}
+
   explicit TargetPackPointer(PointerType const *ptr, PackLifetime lifetime)
     : Ptr(reinterpret_cast<typename Runtime::StoredSize>(ptr) |
           (lifetime == PackLifetime::OnHeap ? 1 : 0)) {}
@@ -4890,6 +4892,11 @@ class TargetPackPointer {
     return reinterpret_cast<PointerType *>(Ptr & ~1);
   }
 
+  const PointerType *getPointer() const {
+    return reinterpret_cast<const PointerType *>(Ptr);
+  }
+
+
   PackLifetime getLifetime() const {
     return (bool)(Ptr & 1) ? PackLifetime::OnHeap : PackLifetime::OnStack;
   }

include/swift/Runtime/Metadata.h

@@ -449,30 +449,30 @@ bool swift_compareProtocolConformanceDescriptors(
 ///
 /// Metadata packs are uniqued by pointer equality on their elements.
 ///
-/// \param pack A pack pointer, where the least significant bit indicates if
+/// \param ptr A pack pointer, where the least significant bit indicates if
 /// it is already on the heap.
 /// \param count The number of metadata pointers in the pack.
 ///
 /// \returns a metadata pack allocated on the heap, with the least significant
 /// bit set to true.
 SWIFT_RUNTIME_EXPORT SWIFT_CC(swift)
-MetadataPackPointer
-swift_allocateMetadataPack(MetadataPackPointer pack, unsigned count);
+const Metadata * const *
+swift_allocateMetadataPack(const Metadata * const *ptr, unsigned count);
 
 /// Allocate a witness table pack on the heap, unless this pack is already on
 /// the heap.
 ///
 /// Witness table packs are not uniqued.
 ///
-/// \param pack A pack pointer, where the least significant bit indicates if
+/// \param ptr A pack pointer, where the least significant bit indicates if
 /// it is already on the heap.
 /// \param count The number of witness table pointers in the pack.
 ///
 /// \returns a witness table pack allocated on the heap, with the least
 /// significant bit set to true.
 SWIFT_RUNTIME_EXPORT SWIFT_CC(swift)
-WitnessTablePackPointer
-swift_allocateWitnessTablePack(WitnessTablePackPointer pack, unsigned count);
+const WitnessTable * const *
+swift_allocateWitnessTablePack(const WitnessTable * const *ptr, unsigned count);
 
 /// Fetch a uniqued metadata for a function type.
 SWIFT_RUNTIME_EXPORT

stdlib/public/runtime/Metadata.cpp

@@ -1231,31 +1231,33 @@ MetadataPackCacheEntry::MetadataPackCacheEntry(const Key &key) {
 static SimpleGlobalCache<MetadataPackCacheEntry, MetadataPackTag> MetadataPacks;
 
 SWIFT_RUNTIME_EXPORT SWIFT_CC(swift)
-MetadataPackPointer
-swift_allocateMetadataPack(MetadataPackPointer pack, unsigned count) {
-  if (pack.getLifetime() == PackLifetime::OnHeap)
-    return pack;
+const Metadata * const *
+swift_allocateMetadataPack(const Metadata * const *ptr, unsigned count) {
+  if (MetadataPackPointer(reinterpret_cast<uintptr_t>(ptr)).getLifetime()
+        == PackLifetime::OnHeap)
+    return ptr;
 
-  MetadataPackCacheEntry::Key key{pack.getElements(), count};
+  MetadataPackCacheEntry::Key key{ptr, count};
   auto bytes = MetadataPacks.getOrInsert(key).first->getElements();
 
-  return MetadataPackPointer(bytes, PackLifetime::OnHeap);
+  return MetadataPackPointer(bytes, PackLifetime::OnHeap).getPointer();
 }
 
 SWIFT_RUNTIME_EXPORT SWIFT_CC(swift)
-WitnessTablePackPointer
-swift_allocateWitnessTablePack(WitnessTablePackPointer pack, unsigned count) {
-  if (pack.getLifetime() == PackLifetime::OnHeap)
-    return pack;
+const WitnessTable * const *
+swift_allocateWitnessTablePack(const WitnessTable * const *ptr, unsigned count) {
+  if (WitnessTablePackPointer(reinterpret_cast<uintptr_t>(ptr)).getLifetime()
+        == PackLifetime::OnHeap)
+    return ptr;
 
   size_t totalSize = (size_t) count * sizeof(const WitnessTable *);
 
   auto bytes = (const WitnessTable **)
     MetadataAllocator(WitnessTablePackTag)
       .Allocate(totalSize, alignof(const WitnessTable *));
-  memcpy((char*) bytes, pack.getElements(), totalSize);
+  memcpy((char*) bytes, ptr, totalSize);
 
-  return WitnessTablePackPointer(bytes, PackLifetime::OnHeap);
+  return WitnessTablePackPointer(bytes, PackLifetime::OnHeap).getPointer();
 }
 
 /***************************************************************************/