AST: Factor out maybeEmitFallbackConformanceDiagnostic() from addDelayedConformanceDiag()

Author: slavapestov

lib/AST/ASTContext.cpp

@@ -2780,48 +2780,58 @@ ASTContext::MissingWitness::MissingWitness(ValueDecl *requirement,
   : requirement(requirement),
     matches(matches.begin(), matches.end()) { }
 
-void ASTContext::addDelayedConformanceDiag(
-       NormalProtocolConformance *conformance, bool isError,
-       std::function<void(NormalProtocolConformance *)> callback) {
-  if (isError)
-    conformance->setInvalid();
-
-  auto &diagnostics = getImpl().DelayedConformanceDiags[conformance];
+static void maybeEmitFallbackConformanceDiagnostic(
+    ASTContext &ctx,
+    NormalProtocolConformance *conformance,
+    DelayedConformanceDiags &diagnostics) {
 
-  if (isError && !diagnostics.HadError) {
-    diagnostics.HadError = true;
+  if (diagnostics.HadError)
+    return;
 
-    auto *proto = conformance->getProtocol();
-    auto *dc = conformance->getDeclContext();
-    auto *sf = dc->getParentSourceFile();
-    auto *mod = sf->getParentModule();
-    assert(mod->isMainModule());
+  diagnostics.HadError = true;
 
-    // If we have at least one primary file and the conformance is declared in a
-    // non-primary file, emit a fallback diagnostic.
-    if ((!sf->isPrimary() && !mod->getPrimarySourceFiles().empty()) ||
-        TypeCheckerOpts.EnableLazyTypecheck) {
-      auto complainLoc = evaluator.getInnermostSourceLoc([&](SourceLoc loc) {
-        if (loc.isInvalid())
-          return false;
+  auto *proto = conformance->getProtocol();
+  auto *dc = conformance->getDeclContext();
+  auto *sf = dc->getParentSourceFile();
+  auto *mod = sf->getParentModule();
+  assert(mod->isMainModule());
 
-        auto *otherSF = mod->getSourceFileContainingLocation(loc);
-        if (otherSF == nullptr)
-          return false;
+  // If we have at least one primary file and the conformance is declared in a
+  // non-primary file, emit a fallback diagnostic.
+  if ((!sf->isPrimary() && !mod->getPrimarySourceFiles().empty()) ||
+      ctx.TypeCheckerOpts.EnableLazyTypecheck) {
+    auto complainLoc = ctx.evaluator.getInnermostSourceLoc([&](SourceLoc loc) {
+      if (loc.isInvalid())
+        return false;
 
-        return otherSF->isPrimary();
-      });
+      auto *otherSF = mod->getSourceFileContainingLocation(loc);
+      if (otherSF == nullptr)
+        return false;
 
-      if (complainLoc.isInvalid()) {
-        complainLoc = conformance->getLoc();
-      }
+      return otherSF->isPrimary();
+    });
 
-      Diags.diagnose(complainLoc,
-                     diag::type_does_not_conform,
-                     dc->getSelfInterfaceType(),
-                     proto->getDeclaredInterfaceType());
+    if (complainLoc.isInvalid()) {
+      complainLoc = conformance->getLoc();
     }
+
+    ctx.Diags.diagnose(complainLoc,
+                       diag::type_does_not_conform,
+                       dc->getSelfInterfaceType(),
+                       proto->getDeclaredInterfaceType());
   }
+}
+
+void ASTContext::addDelayedConformanceDiag(
+       NormalProtocolConformance *conformance, bool isError,
+       std::function<void(NormalProtocolConformance *)> callback) {
+  if (isError)
+    conformance->setInvalid();
+
+  auto &diagnostics = getImpl().DelayedConformanceDiags[conformance];
+
+  if (isError)
+    maybeEmitFallbackConformanceDiagnostic(*this, conformance, diagnostics);
 
   diagnostics.Diags.push_back({isError, callback});
 }