Runtime: GenericParamPackShapeDescriptor => GenericPackShapeDescriptor

We also need to track witness table packs, and store an index here for
convenient access from the metadata caching key comparison logic.

Author: slavapestov

include/swift/ABI/GenericContext.h

@@ -46,7 +46,7 @@ class GenericContextDescriptorFlags {
 
   /// Whether this generic context has at least one type parameter
   /// pack, in which case the generic context will have a trailing
-  /// GenericParamPackShapeHeader.
+  /// GenericPackShapeHeader.
   constexpr bool hasTypePacks() const {
     return (Value & 0x1) != 0;
   }
@@ -245,23 +245,39 @@ class TargetGenericRequirementDescriptor {
 using GenericRequirementDescriptor =
   TargetGenericRequirementDescriptor<InProcess>;
 
-struct GenericParamPackShapeHeader {
-  /// The number of generic parameters which are packs.
+struct GenericPackShapeHeader {
+  /// The number of generic parameters and conformance requirements
+  /// which are packs.
   ///
-  /// Must equal the number of GenericParamDescriptors whose kind is
-  /// GenericParamKind::TypePack.
-  uint16_t NumTypePacks;
+  /// Must equal the sum of:
+  /// - the number of GenericParamDescriptors whose kind is
+  ///   GenericParamKind::TypePack and isKeyArgument bits set;
+  /// - the number of GenericRequirementDescriptors with the
+  ///   isPackRequirement and isKeyArgument bits set
+  uint16_t NumPacks;
 
   /// The number of equivalence classes in the same-shape relation.
   uint16_t NumShapeClasses;
 };
 
-struct GenericParamPackShapeDescriptor {
-  /// The equivalence class of this generic parameter pack under
-  /// the same-shape relation.
+enum class GenericPackKind: uint16_t {
+  Metadata = 0,
+  WitnessTable = 1
+};
+
+struct GenericPackShapeDescriptor {
+  GenericPackKind Kind;
+
+  /// The index of this metadata pack or witness table pack in the
+  /// generic arguments array.
+  uint16_t Index;
+
+  /// The equivalence class of this pack under the same-shape relation.
   ///
-  /// Must be less than GenericParamPackShapeHeader::NumShapeClasses.
+  /// Must be less than GenericPackShapeHeader::NumShapeClasses.
   uint16_t ShapeClass;
+
+  uint16_t Unused;
 };
 
 /// An array of generic parameter descriptors, all
@@ -299,8 +315,8 @@ class RuntimeGenericSignature {
   TargetGenericContextDescriptorHeader<Runtime> Header;
   const GenericParamDescriptor *Params;
   const TargetGenericRequirementDescriptor<Runtime> *Requirements;
-  GenericParamPackShapeHeader PackShapeHeader;
-  const GenericParamPackShapeDescriptor *PackShapeDescriptors;
+  GenericPackShapeHeader PackShapeHeader;
+  const GenericPackShapeDescriptor *PackShapeDescriptors;
 
 public:
   RuntimeGenericSignature()
@@ -310,8 +326,8 @@ class RuntimeGenericSignature {
   RuntimeGenericSignature(const TargetGenericContextDescriptorHeader<Runtime> &header,
                           const GenericParamDescriptor *params,
                           const TargetGenericRequirementDescriptor<Runtime> *requirements,
-                          const GenericParamPackShapeHeader &packShapeHeader,
-                          const GenericParamPackShapeDescriptor *packShapeDescriptors)
+                          const GenericPackShapeHeader &packShapeHeader,
+                          const GenericPackShapeDescriptor *packShapeDescriptors)
     : Header(header), Params(params), Requirements(requirements),
       PackShapeHeader(packShapeHeader), PackShapeDescriptors(packShapeDescriptors) {}
 
@@ -323,8 +339,12 @@ class RuntimeGenericSignature {
     return llvm::makeArrayRef(Requirements, Header.NumRequirements);
   }
 
-  llvm::ArrayRef<GenericParamPackShapeDescriptor> getPackShapeDescriptors() const {
-    return llvm::makeArrayRef(PackShapeDescriptors, PackShapeHeader.NumTypePacks);
+  const GenericPackShapeHeader &getGenericPackShapeHeader() const {
+    return PackShapeHeader;
+  }
+
+  llvm::ArrayRef<GenericPackShapeDescriptor> getGenericPackShapeDescriptors() const {
+    return llvm::makeArrayRef(PackShapeDescriptors, PackShapeHeader.NumPacks);
   }
 
   size_t getArgumentLayoutSizeInWords() const {
@@ -417,8 +437,8 @@ class TrailingGenericContextObjects<TargetSelf<Runtime>,
       TargetGenericContextHeaderType<Runtime>,
       GenericParamDescriptor,
       TargetGenericRequirementDescriptor<Runtime>,
-      GenericParamPackShapeHeader,
-      GenericParamPackShapeDescriptor,
+      GenericPackShapeHeader,
+      GenericPackShapeDescriptor,
       FollowingTrailingObjects...>
 {
 protected:
@@ -431,8 +451,8 @@ class TrailingGenericContextObjects<TargetSelf<Runtime>,
     GenericContextHeaderType,
     GenericParamDescriptor,
     GenericRequirementDescriptor,
-    GenericParamPackShapeHeader,
-    GenericParamPackShapeDescriptor,
+    GenericPackShapeHeader,
+    GenericPackShapeDescriptor,
     FollowingTrailingObjects...>;
   friend TrailingObjects;
 
@@ -487,21 +507,21 @@ class TrailingGenericContextObjects<TargetSelf<Runtime>,
             getGenericContextHeader().NumRequirements};
   }
 
-  GenericParamPackShapeHeader getGenericParamPackShapeHeader() const {
+  GenericPackShapeHeader getGenericPackShapeHeader() const {
     if (!asSelf()->isGeneric())
       return {0, 0};
     if (!getGenericContextHeader().Flags.hasTypePacks())
       return {0, 0};
-    return *this->template getTrailingObjects<GenericParamPackShapeHeader>();
+    return *this->template getTrailingObjects<GenericPackShapeHeader>();
   }
 
-  llvm::ArrayRef<GenericParamPackShapeDescriptor> getGenericParamPackShapeDescriptors() const {
-    auto header = getGenericParamPackShapeHeader();
-    if (header.NumTypePacks == 0)
+  llvm::ArrayRef<GenericPackShapeDescriptor> getGenericPackShapeDescriptors() const {
+    auto header = getGenericPackShapeHeader();
+    if (header.NumPacks == 0)
       return {};
 
-    return {this->template getTrailingObjects<GenericParamPackShapeDescriptor>(),
-            header.NumTypePacks};
+    return {this->template getTrailingObjects<GenericPackShapeDescriptor>(),
+            header.NumPacks};
   }
 
   /// Return the amount of space that the generic arguments take up in
@@ -516,8 +536,8 @@ class TrailingGenericContextObjects<TargetSelf<Runtime>,
     return {getGenericContextHeader(),
             getGenericParams().data(),
             getGenericRequirements().data(),
-            getGenericParamPackShapeHeader(),
-            getGenericParamPackShapeDescriptors().data()};
+            getGenericPackShapeHeader(),
+            getGenericPackShapeDescriptors().data()};
   }
 
 protected:
@@ -533,21 +553,21 @@ class TrailingGenericContextObjects<TargetSelf<Runtime>,
     return asSelf()->isGeneric() ? getGenericContextHeader().NumRequirements : 0;
   }
 
-  size_t numTrailingObjects(OverloadToken<GenericParamPackShapeHeader>) const {
+  size_t numTrailingObjects(OverloadToken<GenericPackShapeHeader>) const {
     if (!asSelf()->isGeneric())
       return 0;
 
     return getGenericContextHeader().Flags.hasTypePacks() ? 1 : 0;
   }
 
-  size_t numTrailingObjects(OverloadToken<GenericParamPackShapeDescriptor>) const {
+  size_t numTrailingObjects(OverloadToken<GenericPackShapeDescriptor>) const {
     if (!asSelf()->isGeneric())
       return 0;
 
     if (!getGenericContextHeader().Flags.hasTypePacks())
       return 0;
 
-    return getGenericParamPackShapeHeader().NumTypePacks;
+    return getGenericPackShapeHeader().NumPacks;
   }
 
 #if defined(_MSC_VER) && _MSC_VER < 1920

include/swift/ABI/Metadata.h

@@ -1932,10 +1932,10 @@ struct TargetExtendedExistentialTypeShape
       TargetGenericRequirementDescriptor<Runtime>,
       // Optional header describing any type packs in the generalization
       // signature.
-      GenericParamPackShapeHeader,
+      GenericPackShapeHeader,
       // For each type pack in the generalization signature, a descriptor
       // storing the shape class.
-      GenericParamPackShapeDescriptor> {
+      GenericPackShapeDescriptor> {
 private:
   using RelativeValueWitnessTablePointer =
     TargetRelativeIndirectablePointer<Runtime,
@@ -1949,8 +1949,8 @@ struct TargetExtendedExistentialTypeShape
       RelativeValueWitnessTablePointer,
       GenericParamDescriptor,
       TargetGenericRequirementDescriptor<Runtime>,
-      GenericParamPackShapeHeader,
-      GenericParamPackShapeDescriptor>;
+      GenericPackShapeHeader,
+      GenericPackShapeDescriptor>;
   friend TrailingObjects;
 
   template<typename T>
@@ -1977,11 +1977,11 @@ struct TargetExtendedExistentialTypeShape
     return getNumGenSigRequirements() + getNumReqSigRequirements();
   }
 
-  size_t numTrailingObjects(OverloadToken<GenericParamPackShapeHeader>) const {
+  size_t numTrailingObjects(OverloadToken<GenericPackShapeHeader>) const {
     return (Flags.hasTypePacks() ? 1 : 0);
   }
 
-  size_t numTrailingObjects(OverloadToken<GenericParamPackShapeDescriptor>) const {
+  size_t numTrailingObjects(OverloadToken<GenericPackShapeDescriptor>) const {
     if (!Flags.hasTypePacks())
       return 0;
 
@@ -2142,18 +2142,18 @@ struct TargetExtendedExistentialTypeShape
     return getReqSigRequirements() + ReqSigHeader.NumRequirements;
   }
 
-  GenericParamPackShapeHeader getGenSigPackShapeHeader() const {
+  GenericPackShapeHeader getGenSigPackShapeHeader() const {
     assert(hasGeneralizationSignature());
     if (!Flags.hasTypePacks())
       return {0, 0};
-    return *this->template getTrailingObjects<GenericParamPackShapeHeader>();
+    return *this->template getTrailingObjects<GenericPackShapeHeader>();
   }
 
-  const GenericParamPackShapeDescriptor *getGenSigPackShapeDescriptors() const {
+  const GenericPackShapeDescriptor *getGenSigPackShapeDescriptors() const {
     assert(hasGeneralizationSignature());
     if (!Flags.hasTypePacks())
       return nullptr;
-    return this->template getTrailingObjects<GenericParamPackShapeDescriptor>();
+    return this->template getTrailingObjects<GenericPackShapeDescriptor>();
   }
 
   /// Return the amount of space used in ExtendedExistentialTypeMetadata