Merge pull request #61631 from CodaFi/locavore

Bridge Parser Diagnostics into the C++ Diagnostic Engine

Author: CodaFi

SwiftCompilerSources/Sources/Parse/Regex.swift

@@ -66,7 +66,7 @@ private func _RegexLiteralLexingFn(
       let diagEngine = DiagnosticEngine(bridged: bridged)
       let startLoc = SourceLoc(
         locationInFile: error.location.assumingMemoryBound(to: UInt8.self))!
-      diagEngine.diagnose(startLoc, .regex_literal_parsing_error, error.message)
+      diagEngine.diagnose(startLoc, .foreign_diagnostic, error.message)
     }
     return error.completelyErroneous
   }
@@ -113,7 +113,7 @@ public func _RegexLiteralParsingFn(
       let offset = str.utf8.distance(from: str.startIndex, to: errorLoc)
       diagLoc = _diagLoc.advanced(by: offset)
     }
-    diagEngine.diagnose(diagLoc, .regex_literal_parsing_error, error.message)
+    diagEngine.diagnose(diagLoc, .foreign_diagnostic, error.message)
     return true
   } catch {
     fatalError("Expected CompilerParseError")

include/swift/AST/DiagnosticsParse.def

@@ -91,9 +91,6 @@ ERROR(forbidden_interpolated_string,none,
 ERROR(forbidden_extended_escaping_string,none,
       "%0 cannot be an extended escaping string literal", (StringRef))
 
-ERROR(regex_literal_parsing_error,none,
-      "%0", (StringRef))
-
 //------------------------------------------------------------------------------
 // MARK: Lexer diagnostics
 //------------------------------------------------------------------------------
@@ -1994,5 +1991,12 @@ ERROR(expected_closure_literal,none,
 ERROR(expected_multiple_closures_block_rbrace,none,
       "expected '}' at the end of a trailing closures block", ())
 
+//------------------------------------------------------------------------------
+// MARK: diagnostics emitted by Swift libraries
+//------------------------------------------------------------------------------
+
+ERROR(foreign_diagnostic,none,
+      "%0", (StringRef))
+
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

lib/Parse/ParseRequests.cpp

@@ -215,9 +215,21 @@ SourceFileParsingResult ParseSourceFileRequest::evaluate(Evaluator &evaluator,
       flags |= SCC_FoldSequences;
 
     if (flags) {
+      SourceLoc startLoc =
+          parser.SourceMgr.getLocForBufferStart(parser.L->getBufferID());
+      struct ParserContext {
+        SourceLoc startLoc;
+        DiagnosticEngine *engine;
+      } context{startLoc, &parser.Diags};
       int roundTripResult = swift_parser_consistencyCheck(
           bufferRange.str().data(), bufferRange.getByteLength(),
-          SF->getFilename().str().c_str(), flags);
+          SF->getFilename().str().c_str(), flags, static_cast<void *>(&context),
+          [](ptrdiff_t off, const char *text, void *ctx) {
+            auto *context = static_cast<ParserContext *>(ctx);
+            SourceLoc loc = context->startLoc.getAdvancedLoc(off);
+            context->engine->diagnose(loc, diag::foreign_diagnostic,
+                                      StringRef(text));
+          });
 
       if (roundTripResult)
         ctx.Diags.diagnose(SourceLoc(), diag::new_parser_failure);