Author: Jonas Devlieghere Date: 2025-07-22T15:51:00-07:00 New Revision: 2cb1ecb94bb4e7f89494e59d25707fd9787ff98a
URL: https://github.com/llvm/llvm-project/commit/2cb1ecb94bb4e7f89494e59d25707fd9787ff98a DIFF: https://github.com/llvm/llvm-project/commit/2cb1ecb94bb4e7f89494e59d25707fd9787ff98a.diff LOG: [lldb] Eliminate namespace lldb_private::dwarf (NFC) (#150073) Eliminate the `lldb_private::dwarf` namespace, in favor of using `llvm::dwarf` directly. The latter is shorter, and this avoids ambiguity in the ABI plugins that define a `dwarf` namespace inside an anonymous namespace. Added: Modified: lldb/include/lldb/Core/dwarf.h lldb/source/Expression/DWARFExpression.cpp lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacro.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp lldb/source/Plugins/SymbolFile/DWARF/UniqueDWARFASTType.cpp lldb/source/Plugins/SymbolFile/PDB/PDBLocationToDWARFExpression.cpp lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp lldb/source/Symbol/DWARFCallFrameInfo.cpp lldb/source/Symbol/PostfixExpression.cpp lldb/unittests/Expression/DWARFExpressionTest.cpp lldb/unittests/Symbol/TestTypeSystemClang.cpp lldb/unittests/SymbolFile/DWARF/DWARF64UnitTest.cpp lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp lldb/unittests/SymbolFile/DWARF/DWARFDIETest.cpp lldb/unittests/SymbolFile/DWARF/DWARFDebugNamesIndexTest.cpp lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Core/dwarf.h b/lldb/include/lldb/Core/dwarf.h index 4de5c8f24db02..0663ec04e77fa 100644 --- a/lldb/include/lldb/Core/dwarf.h +++ b/lldb/include/lldb/Core/dwarf.h @@ -14,12 +14,6 @@ // Get the DWARF constant definitions from llvm #include "llvm/BinaryFormat/Dwarf.h" -namespace lldb_private { -namespace dwarf { - using namespace llvm::dwarf; -} -} - typedef llvm::dwarf::Attribute dw_attr_t; typedef llvm::dwarf::Form dw_form_t; typedef llvm::dwarf::Tag dw_tag_t; diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp index 52891fcefd68b..79bc6c87fa9c5 100644 --- a/lldb/source/Expression/DWARFExpression.cpp +++ b/lldb/source/Expression/DWARFExpression.cpp @@ -41,8 +41,8 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; // DWARFExpression constructor DWARFExpression::DWARFExpression() : m_data() {} diff --git a/lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp b/lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp index f4d032388a883..81c6731cafcd1 100644 --- a/lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp +++ b/lldb/source/Plugins/SymbolFile/CTF/SymbolFileCTF.cpp @@ -848,7 +848,7 @@ static DWARFExpression CreateDWARFExpression(ModuleSP module_sp, uint32_t byte_size = architecture.GetDataByteSize(); StreamBuffer<32> stream(Stream::eBinary, address_size, byte_order); - stream.PutHex8(lldb_private::dwarf::DW_OP_addr); + stream.PutHex8(llvm::dwarf::DW_OP_addr); stream.PutMaxHex64(symbol.GetFileAddress(), address_size, byte_order); DataBufferSP buffer = diff --git a/lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp b/lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp index a00127b8e5580..4bfbb4d81f5da 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp @@ -15,10 +15,10 @@ #include "lldb/Symbol/Function.h" #include "llvm/Support/DJB.h" -using namespace lldb_private; using namespace lldb; -using namespace lldb_private::dwarf; +using namespace lldb_private; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; std::unique_ptr<AppleDWARFIndex> AppleDWARFIndex::Create( Module &module, DWARFDataExtractor apple_names, @@ -80,7 +80,7 @@ static bool EntryHasMatchingQualhash(const llvm::AppleAcceleratorTable::Entry &entry, uint32_t expected_hash) { std::optional<llvm::DWARFFormValue> form_value = - entry.lookup(dwarf::DW_ATOM_qual_name_hash); + entry.lookup(llvm::dwarf::DW_ATOM_qual_name_hash); if (!form_value) return false; std::optional<uint64_t> hash = form_value->getAsUnsignedConstant(); @@ -93,7 +93,7 @@ EntryHasMatchingQualhash(const llvm::AppleAcceleratorTable::Entry &entry, static bool EntryHasMatchingTag(const llvm::AppleAcceleratorTable::Entry &entry, dw_tag_t expected_tag) { std::optional<llvm::DWARFFormValue> form_value = - entry.lookup(dwarf::DW_ATOM_die_tag); + entry.lookup(llvm::dwarf::DW_ATOM_die_tag); if (!form_value) return false; std::optional<uint64_t> maybe_tag = form_value->getAsUnsignedConstant(); @@ -109,7 +109,7 @@ static bool EntryHasMatchingTag(const llvm::AppleAcceleratorTable::Entry &entry, static bool HasImplementationFlag(const llvm::AppleAcceleratorTable::Entry &entry) { std::optional<llvm::DWARFFormValue> form_value = - entry.lookup(dwarf::DW_ATOM_type_flags); + entry.lookup(llvm::dwarf::DW_ATOM_type_flags); if (!form_value) return false; std::optional<uint64_t> Flags = form_value->getAsUnsignedConstant(); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.cpp index e53e930665a60..a8eafc94215dc 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParser.cpp @@ -18,8 +18,8 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; std::optional<SymbolFile::ArrayInfo> DWARFASTParser::ParseChildArrayInfo(const DWARFDIE &parent_die, diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp index c76d67b47b336..ba65f50a44d10 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp @@ -65,8 +65,8 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; DWARFASTParserClang::DWARFASTParserClang(TypeSystemClang &ast) : DWARFASTParser(Kind::DWARFASTParserClang), m_ast(ast), diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.cpp index 3d35775e081e3..390ec2b98f62d 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.cpp @@ -10,7 +10,7 @@ #include "DWARFUnit.h" #include "DWARFDebugInfo.h" -using namespace lldb_private::dwarf; +using namespace llvm::dwarf; using namespace lldb_private::plugin::dwarf; DWARFAttributes::DWARFAttributes() : m_infos() {} diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp index 0db230d0a8b56..a9345c79bd2bb 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp @@ -23,8 +23,8 @@ #include "llvm/Support/raw_ostream.h" using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; namespace { diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp index f7df38d240191..b1ca123da8fd6 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp @@ -106,7 +106,7 @@ void DWARFDebugInfo::ParseUnitsFor(DIERef::Section section) { // table lookups can cause the DWO files to be accessed before the skeleton // compile unit is parsed, so we keep a map to allow us to match up the DWO // file to the back to the skeleton compile units. - if (unit_sp->GetUnitType() == lldb_private::dwarf::DW_UT_skeleton) { + if (unit_sp->GetUnitType() == llvm::dwarf::DW_UT_skeleton) { if (std::optional<uint64_t> unit_dwo_id = unit_sp->GetHeaderDWOId()) m_dwarf5_dwo_id_to_skeleton_unit[*unit_dwo_id] = unit_sp.get(); } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp index 13b68e747b1ce..f968eee091344 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp @@ -34,8 +34,8 @@ #include "SymbolFileDWARFDwo.h" using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; extern int g_verbose; // Extract a debug info entry for a given DWARFUnit from the data diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacro.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacro.cpp index 2cd84bc55b751..f574d022d6b05 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacro.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacro.cpp @@ -14,8 +14,8 @@ #include "DWARFDataExtractor.h" using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; DWARFDebugMacroHeader DWARFDebugMacroHeader::ParseHeader(const DWARFDataExtractor &debug_macro_data, diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.cpp index f759cb8fae611..b0fa0c6215a1c 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.cpp @@ -9,8 +9,8 @@ #include "DWARFDeclContext.h" #include "llvm/Support/raw_ostream.h" -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; const char *DWARFDeclContext::Entry::GetName() const { if (name != nullptr) diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp index a159b923f8df4..dbb2a399dabff 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp @@ -19,8 +19,8 @@ #include "DWARFUnit.h" using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; void DWARFFormValue::Clear() { m_unit = nullptr; @@ -564,25 +564,25 @@ uint64_t DWARFFormValue::Reference(dw_offset_t base_offset) const { } std::optional<uint64_t> DWARFFormValue::getAsUnsignedConstant() const { - if ((!IsDataForm(m_form)) || m_form == lldb_private::dwarf::DW_FORM_sdata) + if ((!IsDataForm(m_form)) || m_form == llvm::dwarf::DW_FORM_sdata) return std::nullopt; return m_value.uval; } std::optional<int64_t> DWARFFormValue::getAsSignedConstant() const { if ((!IsDataForm(m_form)) || - (m_form == lldb_private::dwarf::DW_FORM_udata && + (m_form == llvm::dwarf::DW_FORM_udata && uint64_t(std::numeric_limits<int64_t>::max()) < m_value.uval)) return std::nullopt; switch (m_form) { - case lldb_private::dwarf::DW_FORM_data4: + case llvm::dwarf::DW_FORM_data4: return int32_t(m_value.uval); - case lldb_private::dwarf::DW_FORM_data2: + case llvm::dwarf::DW_FORM_data2: return int16_t(m_value.uval); - case lldb_private::dwarf::DW_FORM_data1: + case llvm::dwarf::DW_FORM_data1: return int8_t(m_value.uval); - case lldb_private::dwarf::DW_FORM_sdata: - case lldb_private::dwarf::DW_FORM_data8: + case llvm::dwarf::DW_FORM_sdata: + case llvm::dwarf::DW_FORM_data8: default: return m_value.sval; } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp index 8b0fade86f177..a66af5b126eb1 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp @@ -29,8 +29,8 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; extern int g_verbose; diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp index e8c621957ef38..ff1a76b1dd1dc 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp @@ -17,10 +17,10 @@ #include "llvm/ADT/Sequence.h" #include <optional> -using namespace lldb_private; using namespace lldb; -using namespace lldb_private::dwarf; +using namespace lldb_private; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; llvm::Expected<std::unique_ptr<DebugNamesDWARFIndex>> DebugNamesDWARFIndex::Create(Module &module, DWARFDataExtractor debug_names, @@ -484,7 +484,7 @@ void DebugNamesDWARFIndex::GetNamespaces( ConstString name, llvm::function_ref<bool(DWARFDIE die)> callback) { for (const DebugNames::Entry &entry : m_debug_names_up->equal_range(name.GetStringRef())) { - lldb_private::dwarf::Tag entry_tag = entry.tag(); + llvm::dwarf::Tag entry_tag = entry.tag(); if (entry_tag == DW_TAG_namespace || entry_tag == DW_TAG_imported_declaration) { if (!ProcessEntry(entry, callback)) @@ -574,7 +574,7 @@ void DebugNamesDWARFIndex::GetNamespacesWithParents( [](const CompilerContext &ctx) { return !ctx.name.IsEmpty(); }); for (const DebugNames::Entry &entry : m_debug_names_up->equal_range(name.GetStringRef())) { - lldb_private::dwarf::Tag entry_tag = entry.tag(); + llvm::dwarf::Tag entry_tag = entry.tag(); if (entry_tag == DW_TAG_namespace || entry_tag == DW_TAG_imported_declaration) { std::optional<llvm::SmallVector<Entry, 4>> parent_chain = diff --git a/lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp b/lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp index 523820874752a..c858ce2161384 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp @@ -28,8 +28,8 @@ using namespace lldb_private; using namespace lldb; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; void ManualDWARFIndex::Index() { if (m_indexed) diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 5b16ce5f75138..c253442c91050 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -98,8 +98,8 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; LLDB_PLUGIN_DEFINE(SymbolFileDWARF) diff --git a/lldb/source/Plugins/SymbolFile/DWARF/UniqueDWARFASTType.cpp b/lldb/source/Plugins/SymbolFile/DWARF/UniqueDWARFASTType.cpp index b598768b6e49f..6f6120902e62f 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/UniqueDWARFASTType.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/UniqueDWARFASTType.cpp @@ -12,8 +12,8 @@ #include "lldb/Core/Declaration.h" #include "lldb/Target/Language.h" -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; static bool IsStructOrClassTag(llvm::dwarf::Tag Tag) { return Tag == llvm::dwarf::Tag::DW_TAG_class_type || diff --git a/lldb/source/Plugins/SymbolFile/PDB/PDBLocationToDWARFExpression.cpp b/lldb/source/Plugins/SymbolFile/PDB/PDBLocationToDWARFExpression.cpp index 95add31385df6..b5f29c05470f2 100644 --- a/lldb/source/Plugins/SymbolFile/PDB/PDBLocationToDWARFExpression.cpp +++ b/lldb/source/Plugins/SymbolFile/PDB/PDBLocationToDWARFExpression.cpp @@ -25,7 +25,7 @@ using namespace lldb; using namespace lldb_private; using namespace lldb_private::npdb; -using namespace lldb_private::dwarf; +using namespace llvm::dwarf; using namespace llvm::pdb; static std::unique_ptr<IPDBFrameData> diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp index 3226e0accc5ea..d3b758f794497 100644 --- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp +++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp @@ -87,8 +87,8 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; using namespace clang; using llvm::StringSwitch; diff --git a/lldb/source/Symbol/DWARFCallFrameInfo.cpp b/lldb/source/Symbol/DWARFCallFrameInfo.cpp index cb8aa8a26c3f1..a2d748adad64a 100644 --- a/lldb/source/Symbol/DWARFCallFrameInfo.cpp +++ b/lldb/source/Symbol/DWARFCallFrameInfo.cpp @@ -26,7 +26,7 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::dwarf; +using namespace llvm::dwarf; // GetDwarfEHPtr // diff --git a/lldb/source/Symbol/PostfixExpression.cpp b/lldb/source/Symbol/PostfixExpression.cpp index 82db345b459c8..72669b652e1dd 100644 --- a/lldb/source/Symbol/PostfixExpression.cpp +++ b/lldb/source/Symbol/PostfixExpression.cpp @@ -19,7 +19,7 @@ using namespace lldb_private; using namespace lldb_private::postfix; -using namespace lldb_private::dwarf; +using namespace llvm::dwarf; static std::optional<BinaryOpNode::OpType> GetBinaryOpType(llvm::StringRef token) { diff --git a/lldb/unittests/Expression/DWARFExpressionTest.cpp b/lldb/unittests/Expression/DWARFExpressionTest.cpp index 3c4c496889fca..819c9739dde7d 100644 --- a/lldb/unittests/Expression/DWARFExpressionTest.cpp +++ b/lldb/unittests/Expression/DWARFExpressionTest.cpp @@ -24,8 +24,8 @@ #include "gtest/gtest.h" using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; static llvm::Expected<Scalar> Evaluate(llvm::ArrayRef<uint8_t> expr, lldb::ModuleSP module_sp = {}, diff --git a/lldb/unittests/Symbol/TestTypeSystemClang.cpp b/lldb/unittests/Symbol/TestTypeSystemClang.cpp index d555d27bef958..71930ab54f409 100644 --- a/lldb/unittests/Symbol/TestTypeSystemClang.cpp +++ b/lldb/unittests/Symbol/TestTypeSystemClang.cpp @@ -245,7 +245,7 @@ TEST_F(TestTypeSystemClang, TestBuiltinTypeForEmptyTriple) { EXPECT_FALSE(ast.GetBuiltinTypeByName(ConstString("int")).IsValid()); EXPECT_FALSE(ast.GetBuiltinTypeForDWARFEncodingAndBitSize( - "char", dwarf::DW_ATE_signed_char, 8) + "char", llvm::dwarf::DW_ATE_signed_char, 8) .IsValid()); EXPECT_FALSE(ast.GetBuiltinTypeForEncodingAndBitSize(lldb::eEncodingUint, 8) .IsValid()); diff --git a/lldb/unittests/SymbolFile/DWARF/DWARF64UnitTest.cpp b/lldb/unittests/SymbolFile/DWARF/DWARF64UnitTest.cpp index 20061ec191ca1..702bd8cb3c35e 100644 --- a/lldb/unittests/SymbolFile/DWARF/DWARF64UnitTest.cpp +++ b/lldb/unittests/SymbolFile/DWARF/DWARF64UnitTest.cpp @@ -11,8 +11,8 @@ #include "TestingSupport/Symbol/YAMLModuleTester.h" using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; TEST(DWARF64UnitTest, DWARF64DebugInfoAndCU) { const char *yamldata = R"( diff --git a/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp b/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp index d608a57382096..0cae01de2902a 100644 --- a/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp +++ b/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp @@ -17,8 +17,8 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::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 0da26d99ad383..e285ef24dad64 100644 --- a/lldb/unittests/SymbolFile/DWARF/DWARFDIETest.cpp +++ b/lldb/unittests/SymbolFile/DWARF/DWARFDIETest.cpp @@ -20,7 +20,7 @@ using namespace lldb; using namespace lldb_private; using namespace lldb_private::plugin::dwarf; -using namespace lldb_private::dwarf; +using namespace llvm::dwarf; TEST(DWARFDIETest, ChildIteration) { // Tests DWARFDIE::child_iterator. diff --git a/lldb/unittests/SymbolFile/DWARF/DWARFDebugNamesIndexTest.cpp b/lldb/unittests/SymbolFile/DWARF/DWARFDebugNamesIndexTest.cpp index e56e628d68e8c..c5f811ef4d12e 100644 --- a/lldb/unittests/SymbolFile/DWARF/DWARFDebugNamesIndexTest.cpp +++ b/lldb/unittests/SymbolFile/DWARF/DWARFDebugNamesIndexTest.cpp @@ -34,7 +34,7 @@ check_num_matches(DebugNamesDWARFIndex &index, int expected_num_matches, } static DWARFDeclContext::Entry make_entry(const char *c) { - return DWARFDeclContext::Entry(dwarf::DW_TAG_class_type, c); + return DWARFDeclContext::Entry(llvm::dwarf::DW_TAG_class_type, c); } TEST(DWARFDebugNamesIndexTest, FullyQualifiedQueryWithIDXParent) { diff --git a/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp b/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp index 37ecfea26f36c..7f477f1913f9c 100644 --- a/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp +++ b/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp @@ -37,8 +37,8 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::dwarf; using namespace lldb_private::plugin::dwarf; +using namespace llvm::dwarf; using llvm::DWARFDebugArangeSet; class SymbolFileDWARFTests : public testing::Test { _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
