Skip to content

Commit 9ba3524

Browse files
committed
[lldb] Update DWARFASTParser references to use new plugin::dwarf namespace
(cherry picked from commit 78598ae)
1 parent ca77310 commit 9ba3524

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include "UniqueDWARFASTType.h"
4242

4343
class DWARFASTParserClang;
44+
class DWARFASTParserSwift;
4445

4546
namespace llvm {
4647
class DWARFDebugAbbrev;

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,16 @@ namespace llvm {
7777
class LLVMContext;
7878
}
7979

80-
class DWARFASTParser;
8180
class SwiftEnumDescriptor;
8281

8382
namespace lldb_private {
8483

84+
namespace plugin {
85+
namespace dwarf {
86+
class DWARFASTParser;
87+
} // namespace dwarf
88+
} // namespace plugin
89+
8590
struct SourceModule;
8691
class SwiftASTContext;
8792
class ClangExternalASTSourceCallbacks;
@@ -549,7 +554,7 @@ class SwiftASTContext : public TypeSystemSwift {
549554

550555
bool IsFixedSize(CompilerType compiler_type);
551556

552-
DWARFASTParser *GetDWARFParser() override;
557+
plugin::dwarf::DWARFASTParser *GetDWARFParser() override;
553558

554559
// CompilerDecl functions
555560
ConstString DeclGetName(void *opaque_decl) override {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
109109
Status IsCompatible() override;
110110

111111
void DiagnoseWarnings(Process &process, Module &module) const override;
112-
DWARFASTParser *GetDWARFParser() override;
112+
plugin::dwarf::DWARFASTParser *GetDWARFParser() override;
113113
// CompilerDecl functions
114114
ConstString DeclGetName(void *opaque_decl) override {
115115
return ConstString("");
@@ -496,7 +496,7 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
496496
mutable std::unique_ptr<SwiftDWARFImporterForClangTypes>
497497
m_dwarf_importer_for_clang_types_up;
498498
mutable std::unique_ptr<ClangNameImporter> m_name_importer_up;
499-
std::unique_ptr<DWARFASTParser> m_dwarf_ast_parser_up;
499+
std::unique_ptr<plugin::dwarf::DWARFASTParser> m_dwarf_ast_parser_up;
500500

501501
/// The APINotesManager responsible for each Clang module.
502502
llvm::DenseMap<clang::Module *,

0 commit comments

Comments
 (0)