AST: Nuke TypeMatcher::considerThrownErrorTypes()

Author: slavapestov

include/swift/AST/TypeMatcher.h

@@ -397,12 +397,10 @@ class TypeMatcher {
             return false;
         }
 
-        // If requested, compare the thrown error types.
+        // Compare the thrown error types.
         Type thrownError1 = firstFunc->getEffectiveThrownErrorTypeOrNever();
         Type thrownError2 = secondFunc->getEffectiveThrownErrorTypeOrNever();
-        if (Matcher.asDerived().considerThrownErrorTypes(thrownError1,
-                                                         thrownError2) &&
-            !this->visit(thrownError1->getCanonicalType(),
+        if (!this->visit(thrownError1->getCanonicalType(),
                          thrownError2, thrownError1))
           return false;
 
@@ -567,10 +565,6 @@ class TypeMatcher {
     return MatchVisitor(*this).visit(first->getCanonicalType(), second,
                                      first);
   }
-
-  bool considerThrownErrorTypes(Type errorType1, Type errorType2) const {
-    return false;
-  }
 };
 
 } // end namespace swift

lib/Sema/TypeCheckProtocolInference.cpp

@@ -752,10 +752,6 @@ AssociatedTypeInference::inferTypeWitnessesViaValueWitness(ValueDecl *req,
                   TypeBase *secondType, Type sugaredFirstType) {
       return true;
     }
-
-    bool considerThrownErrorTypes(Type errorType1, Type errorType2) const {
-      return errorType1->hasTypeParameter();
-    }
   };
 
   // Match a requirement and witness type.