Separate out the per-module and expression versions of LookupClangType (NFC)

Author: adrian-prantl

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

@@ -190,7 +190,6 @@ GetMangledName(swift::Demangle::Demangler &dem,
   return mangleNode(global);
 }
 
-/// Find a Clang type by name in the modules in \p module_holder.
 TypeSP TypeSystemSwiftTypeRef::LookupClangType(StringRef name_ref) {
   llvm::SmallVector<CompilerContext, 2> decl_context;
   // Make up a decl context for non-nested types.
@@ -199,40 +198,40 @@ TypeSP TypeSystemSwiftTypeRef::LookupClangType(StringRef name_ref) {
   return LookupClangType(name_ref, decl_context);
 }
 
-/// Find a Clang type by name in the modules in \p module_holder.
-TypeSP TypeSystemSwiftTypeRef::LookupClangType(
-    StringRef name_ref, llvm::ArrayRef<CompilerContext> decl_context) {
-
+/// Look up one Clang type in a module.
+static TypeSP LookupClangType(Module &m,
+                              llvm::ArrayRef<CompilerContext> decl_context) {
   TypeQuery query(decl_context, TypeQueryOptions::e_find_one |
                                     TypeQueryOptions::e_module_search);
   query.SetLanguages(TypeSystemClang::GetSupportedLanguagesForTypes());
+  TypeResults results;
+  m.FindTypes(query, results);
+  return results.GetFirstType();
+}
 
-  auto lookup = [&](Module &M) -> TypeSP {
-    TypeResults results;
-    M.FindTypes(query, results);
-    return results.GetFirstType();
-  };
+TypeSP TypeSystemSwiftTypeRef::LookupClangType(
+    StringRef name_ref, llvm::ArrayRef<CompilerContext> decl_context) {
+  Module *m = GetModule();
+  if (!m)
+    return {};
+  return ::LookupClangType(const_cast<Module &>(*m), decl_context);
+}
 
+TypeSP TypeSystemSwiftTypeRefForExpressions::LookupClangType(
+    StringRef name_ref, llvm::ArrayRef<CompilerContext> decl_context) {
   // Check the cache first. Negative results are also cached.
   TypeSP result;
   ConstString name(name_ref);
   if (m_clang_type_cache.Lookup(name.AsCString(), result))
     return result;
 
-  if (auto *M = GetModule()) {
-    TypeSP result = lookup(*M);
-    // Cache it.
-    m_clang_type_cache.Insert(name.AsCString(), result);
-    return result;
-  }
-
   TargetSP target_sp = GetTargetWP().lock();
   if (!target_sp)
     return {};
-  target_sp->GetImages().ForEach([&](const ModuleSP &module) -> bool {
+  target_sp->GetImages().ForEach([&](const ModuleSP &m) -> bool {
     // Don't recursively call into LookupClangTypes() to avoid filling
     // hundreds of image caches with negative results.
-    result = lookup(const_cast<Module &>(*module));
+    result = ::LookupClangType(const_cast<Module &>(*m), decl_context);
     // Cache it in the expression context.
     if (result)
       m_clang_type_cache.Insert(name.AsCString(), result);

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

@@ -383,9 +383,10 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
   lldb::TypeSP LookupClangType(llvm::StringRef name_ref);
 
   /// Search the debug info for a Clang type with the specified name and decl
-  /// context, and cache the result.
-  lldb::TypeSP LookupClangType(llvm::StringRef name_ref,
-                               llvm::ArrayRef<CompilerContext> decl_context);
+  /// context.
+  virtual lldb::TypeSP
+  LookupClangType(llvm::StringRef name_ref,
+                  llvm::ArrayRef<CompilerContext> decl_context);
 
   /// Attempts to convert a Clang type into a Swift type.
   /// For example, int is converted to Int32.
@@ -491,8 +492,6 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
 
   /// All lldb::Type pointers produced by DWARFASTParser Swift go here.
   ThreadSafeDenseMap<const char *, lldb::TypeSP> m_swift_type_map;
-  /// Map ConstString Clang type identifiers to Clang types.
-  ThreadSafeDenseMap<const char *, lldb::TypeSP> m_clang_type_cache;
 };
 
 /// This one owns a SwiftASTContextForExpressions.
@@ -535,8 +534,13 @@ class TypeSystemSwiftTypeRefForExpressions : public TypeSystemSwiftTypeRef {
   /// Forwards to SwiftASTContext.
   PersistentExpressionState *GetPersistentExpressionState() override;
   Status PerformCompileUnitImports(const SymbolContext &sc);
-  /// Returns how often ModulesDidLoad was called/
+  /// Returns how often ModulesDidLoad was called.
   unsigned GetGeneration() const { return m_generation; }
+  /// Performs a target-wide search.
+  lldb::TypeSP
+  LookupClangType(llvm::StringRef name_ref,
+                  llvm::ArrayRef<CompilerContext> decl_context) override;
+
 
   friend class SwiftASTContextForExpressions;
 protected:
@@ -553,6 +557,8 @@ class TypeSystemSwiftTypeRefForExpressions : public TypeSystemSwiftTypeRef {
   /// Perform all the implicit imports for the current frame.
   mutable std::unique_ptr<SymbolContext> m_initial_symbol_context_up;
   std::unique_ptr<SwiftPersistentExpressionState> m_persistent_state_up;
+  /// Map ConstString Clang type identifiers to Clang types.
+  ThreadSafeDenseMap<const char *, lldb::TypeSP> m_clang_type_cache;
 };
 
 } // namespace lldb_private