Move output of debugger warnings into SwiftASTContext.

The only noticeable side effect is that now each diagnostics printed separately.

Author: adrian-prantl

lldb/include/lldb/Core/Module.h

@@ -844,9 +844,6 @@ class Module : public std::enable_shared_from_this<Module>,
 
 #ifdef LLDB_ENABLE_SWIFT
   void
-  ReportWarningCantLoadSwiftModule(std::string details,
-                                   llvm::Optional<lldb::user_id_t> debugger_id);
-  void
   ReportWarningToolchainMismatch(CompileUnit &comp_unit,
                                  llvm::Optional<lldb::user_id_t> debugger_id);
 
@@ -1110,7 +1107,6 @@ class Module : public std::enable_shared_from_this<Module>,
   std::once_flag m_optimization_warning;
   std::once_flag m_language_warning;
 #ifdef LLDB_ENABLE_SWIFT
-  std::once_flag m_swift_import_warning;
   std::once_flag m_toolchain_mismatch_warning;
 #endif
 

lldb/include/lldb/Target/Process.h

@@ -1350,14 +1350,6 @@ class Process : public std::enable_shared_from_this<Process>,
   void PrintWarningOptimization(const SymbolContext &sc);
 
 #ifdef LLDB_ENABLE_SWIFT
-  /// Prints a async warning message to the user one time per Process
-  /// for a Module whose Swift AST sections couldn't be loaded because
-  /// they aren't buildable on the current machine.
-  ///
-  /// @param [in] module
-  ///     The affected Module.
-  void PrintWarningCantLoadSwiftModule(Module &module, std::string details);
-
   /// Print a user-visible warning about Swift CUs compiled with a
   /// different Swift compiler than the one embedded in LLDB.
   void PrintWarningToolchainMismatch(const SymbolContext &sc);

lldb/source/Core/Module.cpp

@@ -1179,15 +1179,6 @@ void Module::ReportWarningUnsupportedLanguage(
 }
 
 #ifdef LLDB_ENABLE_SWIFT
-void Module::ReportWarningCantLoadSwiftModule(
-    std::string details, llvm::Optional<lldb::user_id_t> debugger_id) {
-  StreamString ss;
-  ss << GetFileSpec() << ": "
-     << "Cannot load Swift type information: " << details;
-  Debugger::ReportWarning(std::string(ss.GetString()), debugger_id,
-                          &m_swift_import_warning);
-}
-
 static llvm::VersionTuple GetAdjustedVersion(llvm::VersionTuple version) {
   return version;
 }

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -1118,9 +1118,14 @@ static void printASTValidationError(
 }
 
 void SwiftASTContext::DiagnoseWarnings(Process &process, Module &module) const {
-  if (HasDiagnostics())
-    process.PrintWarningCantLoadSwiftModule(module,
-                                            GetAllDiagnostics().AsCString());
+  if (!HasDiagnostics())
+    return;
+  auto debugger_id = process.GetTarget().GetDebugger().GetID();
+  std::string msg;
+  llvm::raw_string_ostream(msg) << "Cannot load Swift type information for "
+                                << module.GetFileSpec().GetPath();
+  Debugger::ReportWarning(msg, debugger_id, &m_swift_import_warning);
+  StreamAllDiagnostics(debugger_id);
 }
 
 /// Locate the swift-plugin-server for a plugin library,
@@ -2483,6 +2488,35 @@ Status SwiftASTContext::GetAllDiagnostics() const {
   return error;
 }
 
+void SwiftASTContext::StreamAllDiagnostics(
+    llvm::Optional<lldb::user_id_t> debugger_id) const {
+  Status error = m_fatal_errors;
+  if (!error.Success()) {
+    Debugger::ReportWarning(error.AsCString(), debugger_id,
+                            &m_swift_diags_streamed);
+    return;
+  }
+
+  // Retrieve the error message from the DiagnosticConsumer.
+  DiagnosticManager diagnostic_manager;
+  PrintDiagnostics(diagnostic_manager);
+  for (auto &diag : diagnostic_manager.Diagnostics())
+    if (diag) {
+      std::string msg = diag->GetMessage().str();
+      switch (diag->GetSeverity()) {
+      case eDiagnosticSeverityError:
+        Debugger::ReportError(msg, debugger_id, &m_swift_diags_streamed);
+        break;
+      case eDiagnosticSeverityWarning:
+      case eDiagnosticSeverityRemark:
+        Debugger::ReportWarning(msg, debugger_id, &m_swift_warning_streamed);
+        break;
+      }
+    }
+  static_cast<StoringDiagnosticConsumer *>(m_diagnostic_consumer_ap.get())
+      ->Clear();
+}
+
 void SwiftASTContext::LogFatalErrors() const {
   // Avoid spamming the health log with redundant copies of the fatal error.
   if (m_logged_fatal_error) {

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

@@ -859,6 +859,8 @@ class SwiftASTContext : public TypeSystemSwift {
   /// Called by the VALID_OR_RETURN macro to log all errors.
   void LogFatalErrors() const;
   Status GetAllDiagnostics() const;
+  /// Stream all diagnostics to the Debugger and clear them.
+  void StreamAllDiagnostics(llvm::Optional<lldb::user_id_t> debugger_id) const;
 
   llvm::TargetOptions *getTargetOptions();
 
@@ -903,6 +905,9 @@ class SwiftASTContext : public TypeSystemSwift {
   std::unique_ptr<swift::irgen::IRGenerator> m_ir_generator_ap;
   std::unique_ptr<swift::irgen::IRGenModule> m_ir_gen_module_ap;
   llvm::once_flag m_ir_gen_module_once;
+  mutable std::once_flag m_swift_import_warning;
+  mutable std::once_flag m_swift_diags_streamed;
+  mutable std::once_flag m_swift_warning_streamed;
   std::unique_ptr<swift::DiagnosticConsumer> m_diagnostic_consumer_ap;
   std::unique_ptr<swift::DependencyTracker> m_dependency_tracker;
   swift::ModuleDecl *m_scratch_module = nullptr;

lldb/source/Target/Process.cpp

@@ -6010,12 +6010,6 @@ void Process::PrintWarningOptimization(const SymbolContext &sc) {
 }
 
 #ifdef LLDB_ENABLE_SWIFT
-void Process::PrintWarningCantLoadSwiftModule(Module &module,
-                                              std::string details) {
-  module.ReportWarningCantLoadSwiftModule(std::move(details),
-                                          GetTarget().GetDebugger().GetID());
-}
-
 void Process::PrintWarningToolchainMismatch(const SymbolContext &sc) {
   if (GetTarget().GetProcessLaunchInfo().IsScriptedProcess())
     // It's very likely that the debugger used to launch the ScriptedProcess

lldb/test/Shell/Swift/DeserializationFailure.test

@@ -18,4 +18,5 @@ run
 expression 1
 
 # The {{ }} avoids accidentally matching the input script!
-# CHECK: a.out:{{ }}{{.*}}The serialized module is corrupted.
+# CHECK: {{ }}a.out
+# CHECK: {{ }}The serialized module is corrupted.