[RequirementMachine] Add a helper method to RequirementMachine to compute

all requirement diagnostics from the minimal rewrite system.

Author: hborla

lib/AST/RequirementMachine/RequirementMachine.cpp

@@ -530,6 +530,12 @@ void RequirementMachine::freeze() {
   System.freeze();
 }
 
+void RequirementMachine::computeRequirementDiagnostics(
+    SmallVectorImpl<RequirementError> &errors, SourceLoc signatureLoc) {
+  System.computeRedundantRequirementDiagnostics(errors);
+  System.computeConflictDiagnostics(errors, signatureLoc);
+}
+
 std::string RequirementMachine::getRuleAsStringForDiagnostics(
     unsigned ruleID) const {
   const auto &rule = System.getRule(ruleID);

lib/AST/RequirementMachine/RequirementMachine.h

@@ -18,6 +18,7 @@
 #include "llvm/ADT/DenseMap.h"
 #include <vector>
 
+#include "Diagnostics.h"
 #include "PropertyMap.h"
 #include "RewriteContext.h"
 #include "RewriteSystem.h"
@@ -115,6 +116,9 @@ class RequirementMachine final {
 
   void freeze();
 
+  void computeRequirementDiagnostics(SmallVectorImpl<RequirementError> &errors,
+                                     SourceLoc signatureLoc);
+
   MutableTerm getLongestValidPrefix(const MutableTerm &term) const;
 
   void buildRequirementsFromRules(

lib/AST/RequirementMachine/RequirementMachineRequests.cpp

@@ -410,8 +410,7 @@ RequirementSignatureRequestRQM::evaluate(Evaluator &evaluator,
     if (ctx.LangOpts.RequirementMachineProtocolSignatures ==
         RequirementMachineMode::Enabled) {
       SmallVector<RequirementError, 4> errors;
-      machine->System.computeRedundantRequirementDiagnostics(errors);
-      machine->System.computeConflictDiagnostics(errors, proto->getLoc());
+      machine->computeRequirementDiagnostics(errors, proto->getLoc());
       diagnoseRequirementErrors(ctx, errors,
                                 /*allowConcreteGenericParams=*/false);
     }
@@ -844,8 +843,7 @@ InferredGenericSignatureRequestRQM::evaluate(
     if (attempt == 0 &&
         ctx.LangOpts.RequirementMachineInferredSignatures ==
         RequirementMachineMode::Enabled) {
-      machine->System.computeRedundantRequirementDiagnostics(errors);
-      machine->System.computeConflictDiagnostics(errors, loc);
+      machine->computeRequirementDiagnostics(errors, loc);
       diagnoseRequirementErrors(ctx, errors, allowConcreteGenericParams);
     }