Report errors in PerformCompileUnitImports to the user in addition to logging them.

Author: adrian-prantl

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

@@ -1409,16 +1409,18 @@ TypeSystemSwiftTypeRefForExpressions::TypeSystemSwiftTypeRefForExpressions(
   }
 }
 
-void TypeSystemSwiftTypeRefForExpressions::PerformCompileUnitImports(
+Status TypeSystemSwiftTypeRefForExpressions::PerformCompileUnitImports(
     SymbolContext &sc) {
-  Status error;
+  Status status;
   lldb::ProcessSP process_sp;
   if (auto target_sp = sc.target_sp)
     process_sp = target_sp->GetProcessSP();
   if (!m_swift_ast_context_initialized)
+    // Stash sc, the import will happen lazily when SwiftASTContext is created.
     m_initial_symbol_context = std::make_unique<SymbolContext>(sc);
   else if (auto *swift_ast_ctx = GetSwiftASTContext())
-    swift_ast_ctx->PerformCompileUnitImports(sc, process_sp, error);
+    swift_ast_ctx->PerformCompileUnitImports(sc, process_sp, status);
+  return status;
 }
 
 UserExpression *TypeSystemSwiftTypeRefForExpressions::GetUserExpression(

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

@@ -481,7 +481,7 @@ class TypeSystemSwiftTypeRefForExpressions : public TypeSystemSwiftTypeRef {
 
   /// Forwards to SwiftASTContext.
   PersistentExpressionState *GetPersistentExpressionState() override;
-  void PerformCompileUnitImports(SymbolContext &sc);
+  Status PerformCompileUnitImports(SymbolContext &sc);
 
   friend class SwiftASTContextForExpressions;
 protected:

lldb/source/Target/Target.cpp

@@ -2798,7 +2798,9 @@ llvm::Optional<SwiftScratchContextReader> Target::GetSwiftScratchContext(
   if (frame_sp && frame_sp.get() && swift_scratch_ctx) {
     SymbolContext sc =
         frame_sp->GetSymbolContext(lldb::eSymbolContextEverything);
-    swift_scratch_ctx->PerformCompileUnitImports(sc);
+    Status status = swift_scratch_ctx->PerformCompileUnitImports(sc);
+    if (status.Fail())
+      Debugger::ReportError(status.AsCString(), GetDebugger().GetID());
   }
 
   if (!swift_scratch_ctx)