Merge pull request #8806 from adrian-prantl/healthy-clang

Log clang errors to swift-healthcheck

Author: adrian-prantl

lldb/source/Plugins/TypeSystem/Swift/StoringDiagnosticConsumer.h

@@ -14,7 +14,7 @@
 #define liblldb_StoringDiagnosticConsumer_h_
 
 #include "Plugins/ExpressionParser/Swift/SwiftDiagnostic.h"
-
+#include "Plugins/Language/Swift/LogChannelSwift.h"
 #include "lldb/Utility/LLDBLog.h"
 #include "lldb/Utility/StreamString.h"
 
@@ -216,8 +216,15 @@ class StoringDiagnosticConsumer : public swift::DiagnosticConsumer {
       if (m_raw_clang_diagnostics.empty() ||
           m_raw_clang_diagnostics.back() != diagnostic) {
         m_raw_clang_diagnostics.push_back(std::move(diagnostic));
-        if (info.Kind == swift::DiagnosticKind::Error)
+        if (info.Kind == swift::DiagnosticKind::Error) {
           m_num_clang_errors++;
+          // Any errors from clang could be related module import
+          // issues which shoud be surfaced in the health log channel.
+          LLDB_LOG(GetLog(LLDBLog::Types), "{0} Clang error: {1}",
+                   m_ast_context.GetDescription(), formatted_text);
+          LLDB_LOG(lldb_private::GetSwiftHealthLog(), "{0} Clang error: {1}",
+                   m_ast_context.GetDescription(), formatted_text);
+        }
       }
     } else {
       m_raw_swift_diagnostics.push_back(std::move(diagnostic));

lldb/test/API/lang/swift/clangimporter/clang_errorhandling/TestSwiftClangErrorHandling.py

@@ -26,5 +26,10 @@ def test_extra_clang_flags(self):
                     '"-DBREAK_STUFF"')
         lldbutil.run_to_source_breakpoint(self, "break here",
                                           lldb.SBFileSpec('main.swift'))
+        log = self.getBuildArtifact("types.log")
+        self.runCmd('log enable lldb types -f "%s"' % log)
+
         self.expect("expr 0", error=True,
                     substrs=['failed to import bridging header'])
+        self.filecheck('platform shell cat "%s"' % log, __file__)
+        # CHECK: Clang error: {{.*}}bridging-header.h