Fix compile errors caused by merging stable into upstream-with-swift.

Author: adrian-prantl

include/lldb/Core/Module.h

@@ -454,6 +454,9 @@ class Module : public std::enable_shared_from_this<Module>,
             llvm::DenseSet<lldb_private::SymbolFile *> &searched_symbol_files,
             TypeList &types);
 
+  size_t FindTypes(llvm::ArrayRef<CompilerContext> pattern, bool append,
+                   TypeMap &types);
+
   lldb::TypeSP FindFirstType(const SymbolContext &sc,
                              ConstString type_name, bool exact_match);
 

source/Core/Module.cpp

@@ -1056,6 +1056,16 @@ size_t Module::FindTypes(
   return num_matches;
 }
 
+size_t Module::FindTypes(llvm::ArrayRef<CompilerContext> pattern, bool append,
+                         TypeMap &types) {
+  static Timer::Category func_cat(LLVM_PRETTY_FUNCTION);
+  Timer scoped_timer(func_cat, LLVM_PRETTY_FUNCTION);
+  if (SymbolFile *symbols = GetSymbolFile())
+    return symbols->FindTypes(pattern, append, types);
+  return 0;
+
+}
+
 SymbolFile *Module::GetSymbolFile(bool can_create, Stream *feedback_strm) {
   if (!m_did_load_symfile.load()) {
     std::lock_guard<std::recursive_mutex> guard(m_mutex);

source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

@@ -2542,11 +2542,8 @@ size_t SymbolFileDWARF::FindTypes(llvm::ArrayRef<CompilerContext> pattern,
   UpdateExternalModuleListIfNeeded();
 
   for (const auto &pair : m_external_type_modules)
-    if (ModuleSP external_module_sp = pair.second) {
-      SymbolVendor *sym_vendor = external_module_sp->GetSymbolVendor();
-      if (sym_vendor)
-        num_matches += sym_vendor->FindTypes(pattern, true, types);
-    }
+    if (ModuleSP external_module_sp = pair.second)
+      num_matches += external_module_sp->FindTypes(pattern, true, types);
   return num_matches;
 }
 

source/Symbol/SwiftASTContext.cpp

@@ -104,6 +104,7 @@
 #include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Symbol/SourceModule.h"
 #include "lldb/Symbol/SymbolFile.h"
+#include "lldb/Symbol/TypeMap.h"
 #include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
@@ -3250,7 +3251,7 @@ class SwiftDWARFImporterDelegate : public swift::DWARFImporterDelegate {
     // Swift doesn't keep track of submodules.
     decl_context.push_back({CompilerContextKind::AnyModule, ConstString()});
     decl_context.push_back({GetCompilerContextKind(kind), ConstString(name)});
-    module->GetSymbolVendor()->FindTypes(decl_context, true, clang_types);
+    module->FindTypes(decl_context, true, clang_types);
 
     clang::FileSystemOptions file_system_options;
     clang::FileManager file_manager(file_system_options);
@@ -3282,7 +3283,7 @@ class SwiftDWARFImporterDelegate : public swift::DWARFImporterDelegate {
           importer.Import(ClangUtil::GetQualType(compiler_type)));
       if (!clang_type) {
         llvm::consumeError(clang_type.takeError());
-        continue;
+        return true;
       }
 
       // Retrieve the imported type's Decl.