Merge pull request #12592 from DougGregor/gsb-flatten-same-type-constraints

Author: swift-ci

include/swift/AST/GenericSignatureBuilder.h

@@ -120,11 +120,8 @@ class GenericSignatureBuilder {
     llvm::MapVector<ProtocolDecl *, std::vector<Constraint<ProtocolDecl *>>>
       conformsTo;
 
-    /// Same-type constraints between each potential archetype and any other
-    /// archetype in its equivalence class.
-    llvm::MapVector<PotentialArchetype *,
-                    std::vector<Constraint<PotentialArchetype *>>>
-      sameTypeConstraints;
+    /// Same-type constraints within this equivalence class.
+    std::vector<Constraint<PotentialArchetype *>> sameTypeConstraints;
 
     /// Concrete type to which this equivalence class is equal.
     ///
@@ -218,8 +215,7 @@ class GenericSignatureBuilder {
     ///
     /// \returns true if this same-type constraint merges two equivalence
     /// classes, and false otherwise.
-    bool recordSameTypeConstraint(GenericSignatureBuilder &builder,
-                                  PotentialArchetype *type1,
+    bool recordSameTypeConstraint(PotentialArchetype *type1,
                                   PotentialArchetype *type2,
                                   const RequirementSource *source);
 
@@ -1669,18 +1665,6 @@ class GenericSignatureBuilder::PotentialArchetype {
   /// potential archetype computations.
   PotentialArchetype *getArchetypeAnchor(GenericSignatureBuilder &builder);
 
-  /// Retrieve the same-type constraints.
-  ArrayRef<Constraint<PotentialArchetype *>> getSameTypeConstraints() const {
-    if (auto equivClass = getEquivalenceClassIfPresent()) {
-      auto known = equivClass->sameTypeConstraints.find(
-                                       const_cast<PotentialArchetype *>(this));
-      if (known == equivClass->sameTypeConstraints.end()) return { };
-      return known->second;
-    }
-
-    return { };
-  }
-
   /// \brief Retrieve (or create) a nested type that is the current best
   /// nested archetype anchor (locally) with the given name.
   ///