Merge pull request #6957 from apple/dl/lldb-Avoid-eager-loading-of-SwiftASTContext-from-TSSwiftTypeRef-SetTriple

[lldb] Avoid eager loading of SwiftASTContext from TSSwiftTypeRef::SetTriple

Author: adrian-prantl

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

@@ -1455,6 +1455,8 @@ SwiftASTContext *TypeSystemSwiftTypeRef::GetSwiftASTContext() const {
         *const_cast<TypeSystemSwiftTypeRef *>(this));
     m_swift_ast_context =
         llvm::dyn_cast_or_null<SwiftASTContext>(m_swift_ast_context_sp.get());
+    if (m_swift_ast_context && !m_swift_ast_context_triple.str().empty())
+      m_swift_ast_context->SetTriple(m_swift_ast_context_triple);
   }
   return m_swift_ast_context;
 }
@@ -1522,8 +1524,10 @@ llvm::Triple TypeSystemSwiftTypeRef::GetTriple() const {
 }
 
 void TypeSystemSwiftTypeRef::SetTriple(const llvm::Triple triple) {
-  if (auto *swift_ast_context = GetSwiftASTContext())
+  if (auto *swift_ast_context = GetSwiftASTContextOrNull())
     swift_ast_context->SetTriple(triple);
+  else
+    m_swift_ast_context_triple = triple;
 }
 
 void TypeSystemSwiftTypeRef::ClearModuleDependentCaches() {

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

@@ -427,6 +427,7 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
 #endif
 
   /// The sibling SwiftASTContext.
+  llvm::Triple m_swift_ast_context_triple;
   mutable bool m_swift_ast_context_initialized = false;
   mutable lldb::TypeSystemSP m_swift_ast_context_sp;
   mutable SwiftASTContext *m_swift_ast_context = nullptr;