Author: walter erquinigo Date: 2023-10-13T17:22:49-04:00 New Revision: a669a237c45a515bea0d258cbbecdbbb3170d57a
URL: https://github.com/llvm/llvm-project/commit/a669a237c45a515bea0d258cbbecdbbb3170d57a DIFF: https://github.com/llvm/llvm-project/commit/a669a237c45a515bea0d258cbbecdbbb3170d57a.diff LOG: [LLDB] Fix buildbots https://lab.llvm.org/buildbot/#/builders/96/builds/46935 https://lab.llvm.org/buildbot/#/builders/68/builds/61651 are failing because of some namespace changes introduced by https://reviews.llvm.org/rG1673a1ba5dec Added: Modified: lldb/unittests/Expression/DWARFExpressionTest.cpp lldb/unittests/Symbol/SymtabTest.cpp lldb/unittests/Symbol/TestLineEntry.cpp lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp lldb/unittests/SymbolFile/DWARF/DWARFDIETest.cpp lldb/unittests/SymbolFile/DWARF/DWARFIndexCachingTest.cpp lldb/unittests/SymbolFile/DWARF/DWARFUnitTest.cpp lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.cpp lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.h Removed: ################################################################################ diff --git a/lldb/unittests/Expression/DWARFExpressionTest.cpp b/lldb/unittests/Expression/DWARFExpressionTest.cpp index b8b5b39422a4f6c..8d77d6b2585f146 100644 --- a/lldb/unittests/Expression/DWARFExpressionTest.cpp +++ b/lldb/unittests/Expression/DWARFExpressionTest.cpp @@ -25,6 +25,7 @@ using namespace lldb_private; using namespace lldb_private::dwarf; +using namespace lldb_private::plugin::dwarf; static llvm::Expected<Scalar> Evaluate(llvm::ArrayRef<uint8_t> expr, lldb::ModuleSP module_sp = {}, diff --git a/lldb/unittests/Symbol/SymtabTest.cpp b/lldb/unittests/Symbol/SymtabTest.cpp index e6b78eb5cd76302..7b8892e5b5c0f6d 100644 --- a/lldb/unittests/Symbol/SymtabTest.cpp +++ b/lldb/unittests/Symbol/SymtabTest.cpp @@ -27,6 +27,7 @@ using namespace lldb; using namespace lldb_private; +using namespace lldb_private::plugin::dwarf; class SymtabTest : public testing::Test { SubsystemRAII<FileSystem, HostInfo, ObjectFileMachO, SymbolFileDWARF, diff --git a/lldb/unittests/Symbol/TestLineEntry.cpp b/lldb/unittests/Symbol/TestLineEntry.cpp index d8b64c525e10bee..592504bc2198ab3 100644 --- a/lldb/unittests/Symbol/TestLineEntry.cpp +++ b/lldb/unittests/Symbol/TestLineEntry.cpp @@ -27,8 +27,9 @@ #include "llvm/Support/Program.h" #include "llvm/Testing/Support/Error.h" -using namespace lldb_private; using namespace lldb; +using namespace lldb_private; +using namespace lldb_private::plugin::dwarf; class LineEntryTest : public testing::Test { SubsystemRAII<FileSystem, HostInfo, ObjectFileMachO, SymbolFileDWARF, diff --git a/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp b/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp index 20a085741f73d00..0c2a0d735dc837d 100644 --- a/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp +++ b/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp @@ -18,6 +18,7 @@ using namespace lldb; using namespace lldb_private; using namespace lldb_private::dwarf; +using namespace lldb_private::plugin::dwarf; namespace { static std::once_flag debugger_initialize_flag; diff --git a/lldb/unittests/SymbolFile/DWARF/DWARFDIETest.cpp b/lldb/unittests/SymbolFile/DWARF/DWARFDIETest.cpp index 7fc37cefea2f239..8497855b2f3db59 100644 --- a/lldb/unittests/SymbolFile/DWARF/DWARFDIETest.cpp +++ b/lldb/unittests/SymbolFile/DWARF/DWARFDIETest.cpp @@ -14,6 +14,7 @@ using namespace lldb; using namespace lldb_private; +using namespace lldb_private::plugin::dwarf; TEST(DWARFDIETest, ChildIteration) { // Tests DWARFDIE::child_iterator. diff --git a/lldb/unittests/SymbolFile/DWARF/DWARFIndexCachingTest.cpp b/lldb/unittests/SymbolFile/DWARF/DWARFIndexCachingTest.cpp index e5d2b8eda0e7a8c..c5f25780a18f33a 100644 --- a/lldb/unittests/SymbolFile/DWARF/DWARFIndexCachingTest.cpp +++ b/lldb/unittests/SymbolFile/DWARF/DWARFIndexCachingTest.cpp @@ -21,6 +21,7 @@ using namespace lldb; using namespace lldb_private; +using namespace lldb_private::plugin::dwarf; static void EncodeDecode(const DIERef &object, ByteOrder byte_order) { const uint8_t addr_size = 8; diff --git a/lldb/unittests/SymbolFile/DWARF/DWARFUnitTest.cpp b/lldb/unittests/SymbolFile/DWARF/DWARFUnitTest.cpp index 123acb6ea8e3f8a..91354494155e6bc 100644 --- a/lldb/unittests/SymbolFile/DWARF/DWARFUnitTest.cpp +++ b/lldb/unittests/SymbolFile/DWARF/DWARFUnitTest.cpp @@ -13,6 +13,7 @@ using namespace lldb; using namespace lldb_private; +using namespace lldb_private::plugin::dwarf; TEST(DWARFUnitTest, NullUnitDie) { // Make sure we don't crash parsing a null unit DIE. diff --git a/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp b/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp index 9cbdeffc59a7f81..3192efe8b339b1e 100644 --- a/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp +++ b/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp @@ -38,6 +38,7 @@ using namespace lldb; using namespace lldb_private; using namespace lldb_private::dwarf; +using namespace lldb_private::plugin::dwarf; class SymbolFileDWARFTests : public testing::Test { SubsystemRAII<FileSystem, HostInfo, ObjectFilePECOFF, SymbolFileDWARF, diff --git a/lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp b/lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp index ca4c29ebb9148f3..c37da89ff79ce73 100644 --- a/lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp +++ b/lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp @@ -19,6 +19,7 @@ using namespace lldb; using namespace lldb_private; +using namespace lldb_private::plugin::dwarf; #ifdef __APPLE__ namespace { diff --git a/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.cpp b/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.cpp index 14e7c7d5203edd6..e9fdbcbafe22ac1 100644 --- a/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.cpp +++ b/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.cpp @@ -13,6 +13,7 @@ #include "llvm/ObjectYAML/DWARFEmitter.h" using namespace lldb_private; +using namespace lldb_private::plugin::dwarf; YAMLModuleTester::YAMLModuleTester(llvm::StringRef yaml_data, size_t cu_index) { llvm::Expected<TestFile> File = TestFile::fromYaml(yaml_data); diff --git a/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.h b/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.h index 3021ca7c9f8c7fd..37d9025cbcebf10 100644 --- a/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.h +++ b/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.h @@ -26,16 +26,16 @@ namespace lldb_private { class YAMLModuleTester { protected: SubsystemRAII<FileSystem, HostInfo, TypeSystemClang, ObjectFileELF, - SymbolFileDWARF> + plugin::dwarf::SymbolFileDWARF> subsystems; std::optional<TestFile> m_file; lldb::ModuleSP m_module_sp; - DWARFUnit *m_dwarf_unit; + plugin::dwarf::DWARFUnit *m_dwarf_unit; public: /// Parse the debug info sections from the YAML description. YAMLModuleTester(llvm::StringRef yaml_data, size_t cu_index = 0); - DWARFUnit *GetDwarfUnit() const { return m_dwarf_unit; } + plugin::dwarf::DWARFUnit *GetDwarfUnit() const { return m_dwarf_unit; } lldb::ModuleSP GetModule() const { return m_module_sp; } }; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits