Merge pull request #37157 from slavapestov/gsb-pre-cleanups-redundant-requirements-rewrite

GSB: Preliminary cleanups before redundant requirement algorithm rewrite

Author: slavapestov

include/swift/AST/GenericSignatureBuilder.h

@@ -624,7 +624,7 @@ class GenericSignatureBuilder {
 
   GenericSignature rebuildSignatureWithoutRedundantRequirements(
                       bool allowConcreteGenericParams,
-                      bool buildingRequirementSignature) &&;
+                      const ProtocolDecl *requirementSignatureSelfProto) &&;
 
   /// Finalize the set of requirements and compute the generic
   /// signature.
@@ -633,7 +633,7 @@ class GenericSignatureBuilder {
   /// generic signature builder no longer has valid state.
   GenericSignature computeGenericSignature(
                       bool allowConcreteGenericParams = false,
-                      bool buildingRequirementSignature = false,
+                      const ProtocolDecl *requirementSignatureSelfProto = nullptr,
                       bool rebuildingWithoutRedundantConformances = false) &&;
 
   /// Compute the requirement signature for the given protocol.
@@ -646,7 +646,8 @@ class GenericSignatureBuilder {
   /// \param allowConcreteGenericParams If true, allow generic parameters to
   /// be made concrete.
   void finalize(TypeArrayView<GenericTypeParamType> genericParams,
-                bool allowConcreteGenericParams=false);
+                bool allowConcreteGenericParams,
+                const ProtocolDecl *requirementSignatureSelfProto);
 
 public:
   /// Process any delayed requirements that can be handled now.
@@ -657,14 +658,12 @@ class GenericSignatureBuilder {
   bool isRedundantExplicitRequirement(const ExplicitRequirement &req) const;
 
 private:
-  void computeRedundantRequirements();
+  void computeRedundantRequirements(const ProtocolDecl *requirementSignatureSelfProto);
 
   void diagnoseRedundantRequirements() const;
 
   void diagnoseConflictingConcreteTypeRequirements() const;
 
-  bool hasExplicitConformancesImpliedByConcrete() const;
-
   /// Describes the relationship between a given constraint and
   /// the canonical constraint of the equivalence class.
   enum class ConstraintRelation {