Sema: Use the return value of checkGenericArguments()

Author: slavapestov

lib/Sema/CSDiag.cpp

@@ -5738,31 +5738,23 @@ bool FailureDiagnosis::diagnoseArgumentGenericRequirements(
     return false;
 
   class RequirementsListener : public GenericRequirementsCheckListener {
-  private:
-    bool DiagnosedAny = false;
-
   public:
     bool shouldCheck(RequirementKind kind, Type first, Type second) override {
       // This means that we have encountered requirement which references
       // generic parameter not used in the arguments, we can't diagnose it here.
       return !(first->hasTypeParameter() || first->isTypeVariableOrMember());
     }
-
-    void diagnosed(const Requirement *requirement) override {
-      DiagnosedAny = true;
-    }
-
-    bool foundProblems() const { return DiagnosedAny; }
   };
 
   RequirementsListener genericReqListener;
-  TC.checkGenericArguments(env->getOwningDeclContext(), argExpr->getLoc(),
-                           AFD->getLoc(), AFD->getInterfaceType(),
-                           env->getGenericSignature(), substitutions, nullptr,
-                           ConformanceCheckFlags::SuppressDependencyTracking,
-                           &genericReqListener);
-
-  return genericReqListener.foundProblems();
+  auto result =
+    TC.checkGenericArguments(env->getOwningDeclContext(), argExpr->getLoc(),
+                             AFD->getLoc(), AFD->getInterfaceType(),
+                             env->getGenericSignature(), substitutions, nullptr,
+                             ConformanceCheckFlags::SuppressDependencyTracking,
+                             &genericReqListener);
+
+  return !result.second;
 }
 
 /// When initializing Unsafe[Mutable]Pointer<T> from Unsafe[Mutable]RawPointer,

lib/Sema/TypeCheckConstraints.cpp

@@ -1388,9 +1388,6 @@ bool GenericRequirementsCheckListener::shouldCheck(RequirementKind kind,
   return true;
 }
 
-void GenericRequirementsCheckListener::diagnosed(
-    const Requirement *requirement) {}
-
 bool TypeChecker::
 solveForExpression(Expr *&expr, DeclContext *dc, Type convertType,
                    FreeTypeVariableBinding allowFreeTypeVariables,

lib/Sema/TypeCheckGeneric.cpp

@@ -900,12 +900,8 @@ std::pair<bool, bool> TypeChecker::checkGenericArguments(
         return std::make_pair(true, false);
 
       // Conformance check failure case.
-      if (!result.second) {
-        if (listener && loc.isValid())
-          listener->diagnosed(&req);
-
+      if (!result.second)
         return std::make_pair(false, false);
-      }
 
       continue;
     }
@@ -929,9 +925,6 @@ std::pair<bool, bool> TypeChecker::checkGenericArguments(
                  genericSig->gatherGenericParamBindingsText(
                      {req.getFirstType(), req.getSecondType()}, substitutions));
 
-        if (listener)
-          listener->diagnosed(&req);
-
         return std::make_pair(false, false);
       }
       continue;
@@ -946,9 +939,6 @@ std::pair<bool, bool> TypeChecker::checkGenericArguments(
                  genericSig->gatherGenericParamBindingsText(
                      {req.getFirstType(), req.getSecondType()}, substitutions));
 
-        if (listener)
-          listener->diagnosed(&req);
-
         return std::make_pair(false, false);
       }
       continue;

lib/Sema/TypeChecker.h

@@ -352,12 +352,6 @@ class GenericRequirementsCheckListener {
   ///
   /// \returns true if it's ok to validate requirement, false otherwise.
   virtual bool shouldCheck(RequirementKind kind, Type first, Type second);
-
-  /// Callback invoked when given requirement has been diagnosed as invalid.
-  ///
-  /// \param requirement The requirement which didn't pass the check.
-  ///
-  virtual void diagnosed(const Requirement *requirement);
 };
 
 /// Flags that describe the context of type checking a pattern or