IRGen: Replace FulfillmentKey with GenericRequirement

Author: slavapestov

include/swift/IRGen/GenericRequirement.h

@@ -13,7 +13,9 @@
 #ifndef SWIFT_AST_GENERIC_REQUIREMENT_H
 #define SWIFT_AST_GENERIC_REQUIREMENT_H
 
+#include "swift/AST/Decl.h"
 #include "swift/AST/Type.h"
+#include "llvm/Support/raw_ostream.h"
 
 namespace swift {
 
@@ -64,6 +66,7 @@ class GenericRequirement {
   }
 
   static GenericRequirement forShape(CanType type) {
+    assert(type->isParameterPack());
     return GenericRequirement(Kind::Shape, type, nullptr);
   }
 
@@ -83,6 +86,20 @@ class GenericRequirement {
     assert(proto != nullptr);
     return GenericRequirement(Kind::WitnessTable, type, proto);
   }
+
+  void dump(llvm::raw_ostream &out) const {
+    switch (kind) {
+    case Kind::Shape:
+      out << "shape: " << type;
+      break;
+    case Kind::Metadata:
+      out << "metadata: " << type;
+      break;
+    case Kind::WitnessTable:
+      out << "witness_table: " << type << " : " << proto->getName();
+      break;
+    }
+  }
 };
 
 } // end namespace swift

lib/IRGen/Fulfillment.cpp

@@ -150,7 +150,7 @@ bool FulfillmentMap::searchTypeMetadata(IRGenModule &IGM, CanType type,
     }
 
     // Add the fulfillment.
-    hadFulfillment |= addFulfillment({type, nullptr},
+    hadFulfillment |= addFulfillment(GenericRequirement::forMetadata(type),
                                      source, std::move(path), metadataState);
     return hadFulfillment;
   }
@@ -251,8 +251,9 @@ bool FulfillmentMap::searchWitnessTable(
   // If we're not limiting the set of interesting conformances, or if
   // this is an interesting conformance, record it.
   if (!interestingConformances || interestingConformances->count(protocol)) {
-    hadFulfillment |= addFulfillment({type, protocol}, source,
-                                     std::move(path), MetadataState::Complete);
+    hadFulfillment |= addFulfillment(
+        GenericRequirement::forWitnessTable(type, protocol), source,
+        std::move(path), MetadataState::Complete);
   }
 
   return hadFulfillment;
@@ -315,7 +316,7 @@ bool FulfillmentMap::searchNominalTypeMetadata(IRGenModule &IGM,
 }
 
 /// Testify that there's a fulfillment at the given path.
-bool FulfillmentMap::addFulfillment(FulfillmentKey key,
+bool FulfillmentMap::addFulfillment(GenericRequirement key,
                                     unsigned source,
                                     MetadataPath &&path,
                                     MetadataState metadataState) {
@@ -360,10 +361,8 @@ static StringRef getStateName(MetadataState state) {
 void FulfillmentMap::dump() const {
   auto &out = llvm::errs();
   for (auto &entry : Fulfillments) {
-    out << "(" << entry.first.first;
-    if (auto proto = entry.first.second) {
-      out << ", " << proto->getNameStr();
-    }
+    out << "(";
+    entry.first.dump(out);
     out << ") => " << getStateName(entry.second.getState())
         << " at sources[" << entry.second.SourceIndex
         << "]." << entry.second.Path << "\n";

lib/IRGen/Fulfillment.h

@@ -21,6 +21,7 @@
 #include "llvm/ADT/DenseMap.h"
 #include "swift/AST/Types.h"
 #include "swift/AST/GenericSignature.h"
+#include "swift/IRGen/GenericRequirement.h"
 #include "MetadataPath.h"
 
 namespace swift {
@@ -48,9 +49,7 @@ struct Fulfillment {
 };
 
 class FulfillmentMap {
-  using FulfillmentKey = std::pair<Type, ProtocolDecl*>;
-
-  llvm::DenseMap<FulfillmentKey, Fulfillment> Fulfillments;
+  llvm::DenseMap<GenericRequirement, Fulfillment> Fulfillments;
 
 public:
   struct InterestingKeysCallback {
@@ -115,25 +114,28 @@ class FulfillmentMap {
   ///
   /// \return true if the fulfillment was added, which won't happen if there's
   ///   already a fulfillment that was at least as good
-  bool addFulfillment(FulfillmentKey key, unsigned source,
+  bool addFulfillment(GenericRequirement key, unsigned source,
                       MetadataPath &&path, MetadataState state);
 
-  const Fulfillment *getTypeMetadata(CanType type) const {
-    auto it = Fulfillments.find({type, nullptr});
+  const Fulfillment *getFulfillment(GenericRequirement key) const {
+    auto it = Fulfillments.find(key);
     if (it != Fulfillments.end()) {
       return &it->second;
     } else {
       return nullptr;
     }
   }
 
+  const Fulfillment *getShape(CanType type) const {
+    return getFulfillment(GenericRequirement::forShape(type));
+  }
+
+  const Fulfillment *getTypeMetadata(CanType type) const {
+    return getFulfillment(GenericRequirement::forMetadata(type));
+  }
+
   const Fulfillment *getWitnessTable(CanType type, ProtocolDecl *proto) const {
-    auto it = Fulfillments.find({type, proto});
-    if (it != Fulfillments.end()) {
-      return &it->second;
-    } else {
-      return nullptr;
-    }
+    return getFulfillment(GenericRequirement::forWitnessTable(type, proto));
   }
 
   void dump() const;

lib/IRGen/GenProto.cpp

@@ -246,7 +246,7 @@ void PolymorphicConvention::addPseudogenericFulfillments() {
                          reqt.getTypeParameter(), erasedTypeParam);
 
     MetadataPath path;
-    Fulfillments.addFulfillment({reqt.getTypeParameter(), reqt.getProtocol()},
+    Fulfillments.addFulfillment(reqt,
                                 Sources.size() - 1, std::move(path),
                                 MetadataState::Complete);
   });
@@ -257,6 +257,17 @@ irgen::enumerateGenericSignatureRequirements(CanGenericSignature signature,
                                           const RequirementCallback &callback) {
   if (!signature) return;
 
+  // Get all unique pack generic parameter shapes.
+  SmallSetVector<CanType, 2> packs;
+  for (auto gp : signature.getGenericParams()) {
+    if (gp->isParameterPack()) {
+      packs.insert(signature->getReducedShape(gp)->getCanonicalType());
+    }
+  }
+
+  for (auto type : packs)
+    callback(GenericRequirement::forShape(type));
+
   // Get all of the type metadata.
   signature->forEachParam([&](GenericTypeParamType *gp, bool canonical) {
     if (canonical)
@@ -442,15 +453,15 @@ void PolymorphicConvention::considerParameter(SILParameterInfo param,
 
 void PolymorphicConvention::addSelfMetadataFulfillment(CanType arg) {
   unsigned source = Sources.size() - 1;
-  Fulfillments.addFulfillment({arg, nullptr},
+  Fulfillments.addFulfillment(GenericRequirement::forMetadata(arg),
                               source, MetadataPath(), MetadataState::Complete);
 }
 
 void PolymorphicConvention::addSelfWitnessTableFulfillment(
     CanType arg, ProtocolConformanceRef conformance) {
   auto proto = conformance.getRequirement();
   unsigned source = Sources.size() - 1;
-  Fulfillments.addFulfillment({arg, proto},
+  Fulfillments.addFulfillment(GenericRequirement::forWitnessTable(arg, proto),
                               source, MetadataPath(), MetadataState::Complete);
 
   if (conformance.isConcrete()) {

lib/IRGen/LocalTypeData.cpp

@@ -542,12 +542,13 @@ addAbstractForFulfillments(IRGenFunction &IGF, FulfillmentMap &&fulfillments,
   };
 
   for (auto &fulfillment : fulfillments) {
-    CanType type = CanType(fulfillment.first.first);
+    CanType type = fulfillment.first.getTypeParameter();
     LocalTypeDataKind localDataKind;
 
     // For now, ignore witness-table fulfillments when they're not for
     // archetypes.
-    if (ProtocolDecl *protocol = fulfillment.first.second) {
+    if (fulfillment.first.isWitnessTable()) {
+      ProtocolDecl *protocol = fulfillment.first.getProtocol();
       if (auto archetype = dyn_cast<ArchetypeType>(type)) {
         auto conformsTo = archetype->getConformsTo();
         auto it = std::find(conformsTo.begin(), conformsTo.end(), protocol);
@@ -558,6 +559,8 @@ addAbstractForFulfillments(IRGenFunction &IGF, FulfillmentMap &&fulfillments,
       }
 
     } else {
+      assert(fulfillment.first.isMetadata());
+
       // Ignore type metadata fulfillments for non-dependent types that
       // we can produce very cheaply.  We don't want to end up emitting
       // the type metadata for Int by chasing through N layers of metadata