Prepend "diagnostic produced by Clang:" to Clang diagnostics.

Author: martinboehme

lib/Frontend/DiagnosticVerifier.cpp

@@ -110,7 +110,7 @@ namespace {
     /// diagnostics for '<unknown>:0' should be considered as unexpected.
     bool verifyUnknown();
 
-    void printRemainingDiagnostics();
+    void printRemainingDiagnostics() const;
 
     /// If there are any -verify errors (e.g. differences between expectations
     /// and actual diagnostics produced), apply fixits to the original source
@@ -698,9 +698,12 @@ bool DiagnosticVerifier::verifyUnknown() {
   return HadError;
 }
 
-void DiagnosticVerifier::printRemainingDiagnostics() {
-  for (const auto &diag: CapturedDiagnostics) {
-    SM.getLLVMSourceMgr().PrintMessage(llvm::errs(), diag);
+void DiagnosticVerifier::printRemainingDiagnostics() const {
+  for (const auto &diag : CapturedDiagnostics) {
+    SM.getLLVMSourceMgr().PrintMessage(
+        llvm::errs(), diag.getLoc(), diag.getKind(),
+        "diagnostic produced by Clang: " + diag.getMessage(),
+        /*Ranges=*/ {}, diag.getFixIts());
   }
 }
 

test/Frontend/verify-broken-c-module.swift

@@ -6,6 +6,6 @@
 // RUN: not %target-typecheck-verify-swift -I %S/Inputs/broken-c-module 2>&1 | %FileCheck %s
 
 // CHECK: [[@LINE+3]]:8: error: unexpected error produced: could not build
-// CHECK: note: in file included from <module-includes>
-// CHECK: broken_c.h:2:11: error: expected function body after function declarator
+// CHECK: note: diagnostic produced by Clang: in file included from <module-includes>
+// CHECK: broken_c.h:2:11: error: diagnostic produced by Clang: expected function body after function declarator
 import BrokenCModule