Author: Adrian Prantl Date: 2020-04-24T16:59:48-07:00 New Revision: af015c1a33b772502be579eb5f62ae3847f27d97
URL: https://github.com/llvm/llvm-project/commit/af015c1a33b772502be579eb5f62ae3847f27d97 DIFF: https://github.com/llvm/llvm-project/commit/af015c1a33b772502be579eb5f62ae3847f27d97.diff LOG: Revert "Add a getter to retrieve the XcodeSDK from Module and unit-test it. (NFC)" This reverts commit 345df863ce649860bea9040fe5c2f10780d29080. (Forgot to git-add the new file) Added: Modified: lldb/include/lldb/Core/Module.h lldb/unittests/SymbolFile/DWARF/CMakeLists.txt lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.cpp lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.h Removed: ################################################################################ diff --git a/lldb/include/lldb/Core/Module.h b/lldb/include/lldb/Core/Module.h index c8cb03e2dee8..35d00d295fa8 100644 --- a/lldb/include/lldb/Core/Module.h +++ b/lldb/include/lldb/Core/Module.h @@ -864,11 +864,6 @@ class Module : public std::enable_shared_from_this<Module>, bool RemapSourceFile(llvm::StringRef path, std::string &new_path) const; bool RemapSourceFile(const char *, std::string &) const = delete; - /// Return the Xcode SDK this module was compiled against. This - /// is computed by merging the SDKs from each compilation unit in - /// the module. - XcodeSDK GetXcodeSDK() const { return m_xcode_sdk; } - /// Update the ArchSpec to a more specific variant. bool MergeArchitecture(const ArchSpec &arch_spec); diff --git a/lldb/unittests/SymbolFile/DWARF/CMakeLists.txt b/lldb/unittests/SymbolFile/DWARF/CMakeLists.txt index ece8266d7ffd..0a4d3cc2938d 100644 --- a/lldb/unittests/SymbolFile/DWARF/CMakeLists.txt +++ b/lldb/unittests/SymbolFile/DWARF/CMakeLists.txt @@ -1,7 +1,6 @@ add_lldb_unittest(SymbolFileDWARFTests DWARFASTParserClangTests.cpp SymbolFileDWARFTests.cpp - XcodeSDKModuleTests.cpp LINK_LIBS lldbCore diff --git a/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp b/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp index 21c2d165c37b..4ec76bda8646 100644 --- a/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp +++ b/lldb/unittests/SymbolFile/DWARF/DWARFASTParserClangTests.cpp @@ -7,7 +7,6 @@ //===----------------------------------------------------------------------===// #include "Plugins/SymbolFile/DWARF/DWARFASTParserClang.h" -#include "Plugins/SymbolFile/DWARF/DWARFCompileUnit.h" #include "Plugins/SymbolFile/DWARF/DWARFDIE.h" #include "TestingSupport/Symbol/YAMLModuleTester.h" #include "gmock/gmock.h" @@ -115,47 +114,3 @@ TEST_F(DWARFASTParserClangTests, EXPECT_THAT(ast_parser.GetDeclContextToDIEMapKeys(), testing::UnorderedElementsAre(decl_ctxs[0], decl_ctxs[3])); } - - -#ifndef __APPLE__ -TEST_F(DWARFASTParserClangTests, TestXcodeSDK) { - PlatformDarwin::Initialize(); - const char *yamldata = R"( -debug_str: - - MacOSX10.9.sdk -debug_abbrev: - - Code: 0x00000001 - Tag: DW_TAG_compile_unit - Children: DW_CHILDREN_no - Attributes: - - Attribute: DW_AT_language - Form: DW_FORM_data2 - - Attribute: DW_AT_APPLE_sdk - Form: DW_FORM_strp -debug_info: - - Length: - TotalLength: 8 - Version: 2 - AbbrOffset: 0 - AddrSize: 8 - Entries: - - AbbrCode: 0x00000001 - Values: - - Value: 0x000000000000000C - - Value: 0x0000000000000000 - - AbbrCode: 0x00000000 - Values: [] -... -)"; - - YAMLModuleTester t(yamldata, "x86_64-apple-macosx"); - auto dwarf_unit_sp = t.GetDwarfUnit(); - auto *dwarf_cu = llvm::cast<DWARFCompileUnit>(dwarf_unit_sp.get()); - ASSERT_TRUE((bool)dwarf_cu); - ASSERT_TRUE((bool)dwarf_cu->GetSymbolFileDWARF().GetCompUnitForDWARFCompUnit( - *dwarf_cu)); - auto module = t.GetModule(); - XcodeSDK sdk = module->GetXcodeSDK(); - ASSERT_EQ(sdk.GetType(), XcodeSDK::Type::MacOSX); -} -#endif diff --git a/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.cpp b/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.cpp index f40ff1db8232..59b6bcc123ea 100644 --- a/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.cpp +++ b/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.cpp @@ -51,8 +51,7 @@ class YAMLObjectFile : public lldb_private::ObjectFile { lldb::SectionType sect_type = llvm::StringSwitch<lldb::SectionType>(name) .Case("debug_info", lldb::eSectionTypeDWARFDebugInfo) - .Case("debug_abbrev", lldb::eSectionTypeDWARFDebugAbbrev) - .Case("debug_str", lldb::eSectionTypeDWARFDebugStr); + .Case("debug_abbrev", lldb::eSectionTypeDWARFDebugAbbrev); auto &membuf = entry.getValue(); lldb::addr_t file_vm_addr = 0; lldb::addr_t vm_size = 0; diff --git a/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.h b/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.h index 7a638b56e872..c8ce1310f629 100644 --- a/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.h +++ b/lldb/unittests/TestingSupport/Symbol/YAMLModuleTester.h @@ -32,8 +32,7 @@ class YAMLModuleTester { public: /// Parse the debug info sections from the YAML description. YAMLModuleTester(llvm::StringRef yaml_data, llvm::StringRef triple); - DWARFUnitSP GetDwarfUnit() const { return m_dwarf_unit; } - lldb::ModuleSP GetModule() const { return m_module_sp; } + DWARFUnitSP GetDwarfUnit() { return m_dwarf_unit; } }; } // namespace lldb_private _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits