GSB: Remove checkSuperclassConstraints() and checkLayoutConstraints()

Author: slavapestov

include/swift/AST/GenericSignatureBuilder.h

@@ -723,23 +723,12 @@ class GenericSignatureBuilder {
                             TypeArrayView<GenericTypeParamType> genericParams,
                             EquivalenceClass *equivClass);
 
-  /// Check the superclass constraints within the equivalence
-  /// class of the given potential archetype.
-  void checkSuperclassConstraints(
-                            TypeArrayView<GenericTypeParamType> genericParams,
-                            EquivalenceClass *equivClass);
-
   /// Check conformance constraints within the equivalence class of the
   /// given potential archetype.
   void checkConformanceConstraints(
                             TypeArrayView<GenericTypeParamType> genericParams,
                             EquivalenceClass *equivClass);
 
-  /// Check layout constraints within the equivalence class of the given
-  /// potential archetype.
-  void checkLayoutConstraints(TypeArrayView<GenericTypeParamType> genericParams,
-                              EquivalenceClass *equivClass);
-
   /// Check same-type constraints within the equivalence class of the
   /// given potential archetype.
   void checkSameTypeConstraints(

lib/AST/GenericSignatureBuilder.cpp

@@ -6380,13 +6380,10 @@ GenericSignatureBuilder::finalize(TypeArrayView<GenericTypeParamType> genericPar
         }
 
         equivClass.recursiveSuperclassType = true;
-      } else {
-        checkSuperclassConstraints(genericParams, &equivClass);
       }
     }
 
     checkConformanceConstraints(genericParams, &equivClass);
-    checkLayoutConstraints(genericParams, &equivClass);
   };
 
   if (!Impl->ExplicitSameTypeRequirements.empty()) {
@@ -7926,22 +7923,6 @@ void GenericSignatureBuilder::checkConcreteTypeConstraints(
     diag::same_type_redundancy_here);
 }
 
-void GenericSignatureBuilder::checkSuperclassConstraints(
-                              TypeArrayView<GenericTypeParamType> genericParams,
-                              EquivalenceClass *equivClass) {
-  assert(equivClass->superclass && "No superclass constraint?");
-
-  removeSelfDerived(*this, equivClass->superclassConstraints, /*proto=*/nullptr);
-}
-
-void GenericSignatureBuilder::checkLayoutConstraints(
-                              TypeArrayView<GenericTypeParamType> genericParams,
-                              EquivalenceClass *equivClass) {
-  if (!equivClass->layout) return;
-
-  removeSelfDerived(*this, equivClass->layoutConstraints, /*proto=*/nullptr);
-}
-
 bool GenericSignatureBuilder::isRedundantExplicitRequirement(
     const ExplicitRequirement &req) const {
   assert(Impl->computedRedundantRequirements &&