Merge commit 'ce97507e8b50' from swift/release/5.9 into stable/20221013

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

Author: adrian-prantl

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -771,7 +771,6 @@ SetupASTContext(SwiftASTContextForExpressions &swift_ast_context,
   // TODO: Find a way to get contraint-solver output sent to a stream
   //       so we can log it.
   // swift_ast_context.GetLanguageOptions().DebugConstraintSolver = true;
-  swift_ast_context.ClearDiagnostics();
 
   // No longer part of debugger support, set it separately.
   swift_ast_context.GetLanguageOptions().EnableDollarIdentifiers = true;
@@ -1217,15 +1216,15 @@ AddArchetypesTypeAliases(std::unique_ptr<SwiftASTManipulator> &code_manipulator,
 /// Attempt to parse an expression and import all the Swift modules
 /// the expression and its context depend on.
 static llvm::Expected<ParsedExpression> ParseAndImport(
-    SwiftASTContextForExpressions &swift_ast_context, Expression &expr,
+    SwiftASTContextForExpressions &swift_ast_context,
+    SwiftASTContext::ScopedDiagnostics &expr_diagnostics, Expression &expr,
     SwiftExpressionParser::SILVariableMap &variable_map, unsigned &buffer_id,
     DiagnosticManager &diagnostic_manager,
     SwiftExpressionParser &swift_expr_parser,
     lldb::StackFrameWP &stack_frame_wp, SymbolContext &sc,
-    ExecutionContextScope &exe_scope, 
+    ExecutionContextScope &exe_scope,
     llvm::SmallVectorImpl<SwiftASTManipulator::VariableInfo> &local_variables,
-    const EvaluateExpressionOptions &options,
-    bool repl, bool playground) {
+    const EvaluateExpressionOptions &options, bool repl, bool playground) {
   Log *log = GetLog(LLDBLog::Expressions);
   LLDB_SCOPED_TIMER();
 
@@ -1373,17 +1372,16 @@ static llvm::Expected<ParsedExpression> ParseAndImport(
   //        inserting them in.
   swift_ast_context.AddDebuggerClient(external_lookup);
 
-  if (swift_ast_context.HasErrors())
+  if (expr_diagnostics.HasErrors())
     return make_error<SwiftASTContextError>();
 
   // Resolve the file's imports, including the implicit ones returned from
   // GetImplicitImports.
   swift::performImportResolution(*source_file);
 
-  if (swift_ast_context.HasErrors())
+  if (expr_diagnostics.HasErrors())
     return make_error<ModuleImportError>(
-        swift_ast_context.GetAllErrors().AsCString(
-            "Explicit module import error"));
+        llvm::toString(expr_diagnostics.GetAllErrors()));
 
   std::unique_ptr<SwiftASTManipulator> code_manipulator;
   if (repl || !playground) {
@@ -1654,18 +1652,24 @@ RedirectCallFromSinkToTrampolineFunction(llvm::Module &module,
 SwiftExpressionParser::ParseResult
 SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
                              uint32_t first_line, uint32_t last_line) {
+  SwiftExpressionParser::SILVariableMap variable_map;
   using ParseResult = SwiftExpressionParser::ParseResult;
   Log *log = GetLog(LLDBLog::Expressions);
   LLDB_SCOPED_TIMER();
 
-  SwiftExpressionParser::SILVariableMap variable_map;
+  // Get a scoped diagnostics consumer for all diagnostics produced by
+  // this expression.
+  auto expr_diagnostics = m_swift_ast_ctx.getScopedDiagnosticConsumer();
+  m_swift_ast_ctx.GetDiagnosticEngine().resetHadAnyError();
 
   // Helper function to diagnose errors in m_swift_scratch_context.
   unsigned buffer_id = UINT32_MAX;
   auto DiagnoseSwiftASTContextError = [&]() {
-    assert(m_swift_ast_ctx.HasErrors() && "error expected");
-    m_swift_ast_ctx.PrintDiagnostics(diagnostic_manager, buffer_id, first_line,
-                                     last_line);
+    assert((expr_diagnostics->HasErrors() ||
+            m_swift_ast_ctx.HasClangImporterErrors()) &&
+           "error expected");
+    expr_diagnostics->PrintDiagnostics(diagnostic_manager, buffer_id,
+                                       first_line, last_line);
   };
 
   // In the case of playgrounds, we turn all rewriting functionality off.
@@ -1677,9 +1681,9 @@ SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
 
   // Parse the expression and import all nececssary swift modules.
   auto parsed_expr = ParseAndImport(
-      m_swift_ast_ctx, m_expr, variable_map, buffer_id, diagnostic_manager,
-      *this, m_stack_frame_wp, m_sc, *m_exe_scope, m_local_variables, m_options,
-      repl, playground);
+      m_swift_ast_ctx, *expr_diagnostics, m_expr, variable_map, buffer_id,
+      diagnostic_manager, *this, m_stack_frame_wp, m_sc, *m_exe_scope,
+      m_local_variables, m_options, repl, playground);
 
   if (!parsed_expr) {
     bool retry = false;
@@ -1738,7 +1742,7 @@ SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
   if (log)
     dumpModule("Module after type checking:");
 
-  if (m_swift_ast_ctx.HasErrors()) {
+  if (expr_diagnostics->HasErrors()) {
     DiagnoseSwiftASTContextError();
     return ParseResult::unrecoverable_error;
   }
@@ -1915,7 +1919,7 @@ SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
     log->PutCString(s.c_str());
   }
 
-  if (m_swift_ast_ctx.HasErrors()) {
+  if (expr_diagnostics->HasErrors()) {
     DiagnoseSwiftASTContextError();
     return ParseResult::unrecoverable_error;
   }
@@ -1943,7 +1947,7 @@ SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
     log->PutCString(s.c_str());
   }
 
-  if (m_swift_ast_ctx.HasErrors()) {
+  if (expr_diagnostics->HasErrors()) {
     DiagnoseSwiftASTContextError();
     return ParseResult::unrecoverable_error;
   }
@@ -1969,30 +1973,22 @@ SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
     m_module.reset(ContextAndModule.second);
   }
 
-  if (m_swift_ast_ctx.HasErrors()) {
+  // If IRGen failed without errors, the root cause may be a fatal
+  // Clang diagnostic.
+  if (expr_diagnostics->HasErrors() ||
+      m_swift_ast_ctx.HasClangImporterErrors()) {
+    diagnostic_manager.PutString(eDiagnosticSeverityRemark,
+                                 "couldn't IRGen expression");
     DiagnoseSwiftASTContextError();
     return ParseResult::unrecoverable_error;
   }
 
   if (!m_module) {
-    auto &warnings = m_swift_ast_ctx.GetModuleImportWarnings();
-    for (StringRef message : warnings) {
-      // FIXME: Don't store diagnostics as strings.
-      auto severity = eDiagnosticSeverityWarning;
-      if (message.consume_front("warning: "))
-        severity = eDiagnosticSeverityWarning;
-      if (message.consume_front("error: "))
-        severity = eDiagnosticSeverityError;
-      diagnostic_manager.PutString(severity, message);
-    }
-    std::string error = "couldn't IRGen expression";
     diagnostic_manager.Printf(
-        eDiagnosticSeverityError, "couldn't IRGen expression. %s",
-        warnings.empty()
-            ? "Please enable the expression log by running \"log enable lldb "
-              "expr\", then run the failing expression again, and file a "
-              "bugreport with the log output."
-            : "Please check the above error messages for possible root causes.");
+        eDiagnosticSeverityError,
+        "couldn't IRGen expression. Please enable the expression log by "
+        "running \"log enable lldb expr\", then run the failing expression "
+        "again, and file a bug report with the log output.");
     return ParseResult::unrecoverable_error;
   }
 
@@ -2032,12 +2028,21 @@ SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
     std::lock_guard<std::recursive_mutex> global_context_locker(
         IRExecutionUnit::GetLLVMGlobalContextMutex());
 
-    LLVMVerifyModule((LLVMOpaqueModule *)m_module.get(), LLVMReturnStatusAction,
-                     nullptr);
+    bool has_errors = LLVMVerifyModule((LLVMOpaqueModule *)m_module.get(),
+                                       LLVMReturnStatusAction, nullptr);
+    if (has_errors) {
+      diagnostic_manager.PutString(eDiagnosticSeverityRemark,
+                                   "LLVM verification error");
+      return ParseResult::unrecoverable_error;
+    }
   }
 
-  if (m_swift_ast_ctx.HasErrors())
+  if (expr_diagnostics->HasErrors()) {
+    diagnostic_manager.PutString(eDiagnosticSeverityRemark,
+                                 "post-IRGen error");
+    DiagnoseSwiftASTContextError();
     return ParseResult::unrecoverable_error;
+  }
 
   // The Parse succeeded!  Now put this module into the context's list
   // of loaded modules, and copy the Decls that were globalized as