Adapt Swift plugin for upstream changes

Author: adrian-prantl

lldb/include/lldb/Symbol/SymbolFile.h

@@ -239,9 +239,6 @@ class SymbolFile : public PluginInterface {
   GetCompilerContextForUID(lldb::user_id_t uid) {
     return {};
   }
-  virtual void
-  GetDeclContextForUID(llvm::SmallVectorImpl<CompilerContext> &context,
-                       lldb::user_id_t uid) {}
   virtual uint32_t ResolveSymbolContext(const Address &so_addr,
                                         lldb::SymbolContextItem resolve_scope,
                                         SymbolContext &sc) = 0;

lldb/include/lldb/Symbol/Type.h

@@ -175,8 +175,7 @@ class Type : public std::enable_shared_from_this<Type>, public UserID {
 
   const lldb_private::Declaration &GetDeclaration() const;
 
-  void GetDeclContext(
-      llvm::SmallVectorImpl<lldb_private::CompilerContext> &context) const;
+  std::vector<lldb_private::CompilerContext> GetDeclContext() const;
 
   // Get the clang type, and resolve definitions for any
   // class/struct/union/enum types completely.

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserSwift.cpp

@@ -37,6 +37,7 @@
 using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::dwarf;
+using namespace lldb_private::plugin::dwarf;
 
 DWARFASTParserSwift::DWARFASTParserSwift(
     TypeSystemSwiftTypeRef &swift_typesystem)

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserSwift.h

@@ -16,13 +16,11 @@
 #include "DWARFASTParser.h"
 #include "DWARFDIE.h"
 
-class DWARFDebugInfoEntry;
-class DWARFDIECollection;
-
 namespace lldb_private { class TypeSystemSwiftTypeRef; }
 
-class DWARFASTParserSwift : public DWARFASTParser {
+class DWARFASTParserSwift : public lldb_private::plugin::dwarf::DWARFASTParser {
 public:
+  using DWARFDIE = lldb_private::plugin::dwarf::DWARFDIE;
   DWARFASTParserSwift(lldb_private::TypeSystemSwiftTypeRef &swift_typesystem);
 
   virtual ~DWARFASTParserSwift();

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h

@@ -45,6 +45,11 @@ namespace llvm {
 class DWARFDebugAbbrev;
 } // namespace llvm
 
+namespace lldb_private {
+  class ClangASTImporter;
+  class SwiftASTContext;
+}
+
 namespace lldb_private::plugin {
 namespace dwarf {
 // Forward Declarations for this DWARF plugin
@@ -62,11 +67,6 @@ class SymbolFileDWARFDebugMap;
 class SymbolFileDWARFDwo;
 class SymbolFileDWARFDwp;
 
-namespace lldb_private {
-  class ClangASTImporter;
-  class SwiftASTContext;
-}
-
 #define DIE_IS_BEING_PARSED ((Type *)1)
 
 class SymbolFileDWARF : public SymbolFileCommon {

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h

@@ -21,6 +21,7 @@
 #include "UniqueDWARFASTType.h"
 
 class DWARFASTParserClang;
+class DWARFASTParserSwift;
 
 namespace lldb_private::plugin {
 namespace dwarf {

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

@@ -8036,7 +8036,7 @@ void SwiftASTContext::DumpTypeDescription(opaque_compiler_type_t type,
     s->Printf("<could not resolve type>");
 }
 
-DWARFASTParser *SwiftASTContext::GetDWARFParser() {
+plugin::dwarf::DWARFASTParser *SwiftASTContext::GetDWARFParser() {
   return GetTypeSystemSwiftTypeRef().GetDWARFParser();
 }
 

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

@@ -930,8 +930,7 @@ TypeSystemSwiftTypeRef::GetSwiftified(swift::Demangle::Demangler &dem,
     return node;
 
   // Extract the toplevel Clang module name from the debug info.
-  llvm::SmallVector<CompilerContext, 4> DeclCtx;
-  clang_type->GetDeclContext(DeclCtx);
+  std::vector<CompilerContext> DeclCtx = clang_type->GetDeclContext();
   StringRef toplevel_module;
   if (resolve_objc_module) {
     for (auto &Context : DeclCtx)
@@ -1592,7 +1591,7 @@ void TypeSystemSwiftTypeRef::DiagnoseWarnings(Process &process,
     swift_ast_context->DiagnoseWarnings(process, module);
 }
 
-DWARFASTParser *TypeSystemSwiftTypeRef::GetDWARFParser() {
+plugin::dwarf::DWARFASTParser *TypeSystemSwiftTypeRef::GetDWARFParser() {
   if (!m_dwarf_ast_parser_up)
     m_dwarf_ast_parser_up.reset(new DWARFASTParserSwift(*this));
   return m_dwarf_ast_parser_up.get();

lldb/source/Symbol/Type.cpp

@@ -656,9 +656,8 @@ uint32_t Type::GetEncodingMask() {
   return encoding_mask;
 }
 
-void Type::GetDeclContext(
-    llvm::SmallVectorImpl<lldb_private::CompilerContext> &context) const {
-  m_symbol_file->GetDeclContextForUID(context, GetID());
+std::vector<lldb_private::CompilerContext> Type::GetDeclContext() const {
+  return m_symbol_file->GetCompilerContextForUID(GetID());
 }
 
 CompilerType Type::GetFullCompilerType() {