aprantl created this revision.
aprantl added reviewers: friss, jingham, JDevlieghere, davide.
Herald added a reviewer: jdoerfert.
aprantl updated this revision to Diff 261573.
aprantl added a comment.
Delete more code that is made obsolete by the new API.
When debugging from a SymbolMap the creation of CompileUnits for the
individual object files is so lazy that RegisterXcodeSDK() is not invoked at all
before the Swift TypeSystem wants to read it. This patch fixes this by
introducing an explicit SymbolFile::ParseXcodeSDK() call that can be
invoked deterministically before the result is required.
rdar://problem/62532151
https://reviews.llvm.org/D79273
Files:
lldb/include/lldb/Symbol/SymbolFile.h
lldb/source/Core/Module.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp
Index: lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp
===================================================================
--- lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp
+++ lldb/unittests/SymbolFile/DWARF/XcodeSDKModuleTests.cpp
@@ -64,13 +64,13 @@
auto triple = "x86_64-apple-macosx";
YAMLModuleTester t(yamldata, triple);
- auto module = t.GetModule();
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));
- XcodeSDK sdk = module->GetXcodeSDK();
+ SymbolFileDWARF &sym_file = dwarf_cu->GetSymbolFileDWARF();
+ CompUnitSP comp_unit = sym_file.GetCompileUnitAtIndex(0);
+ ASSERT_TRUE((bool)comp_unit.get());
+ XcodeSDK sdk = sym_file.ParseXcodeSDK(*comp_unit);
ASSERT_EQ(sdk.GetType(), XcodeSDK::Type::MacOSX);
}
#endif
Index: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
+++ lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
@@ -58,6 +58,9 @@
lldb::LanguageType
ParseLanguage(lldb_private::CompileUnit &comp_unit) override;
+ lldb_private::XcodeSDK
+ ParseXcodeSDK(lldb_private::CompileUnit &comp_unit) override;
+
size_t ParseFunctions(lldb_private::CompileUnit &comp_unit) override;
bool ParseLineTable(lldb_private::CompileUnit &comp_unit) override;
Index: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
@@ -628,6 +628,15 @@
return eLanguageTypeUnknown;
}
+XcodeSDK
+SymbolFileDWARFDebugMap::ParseXcodeSDK(CompileUnit &comp_unit) {
+ std::lock_guard<std::recursive_mutex> guard(GetModuleMutex());
+ SymbolFileDWARF *oso_dwarf = GetSymbolFile(comp_unit);
+ if (oso_dwarf)
+ return oso_dwarf->ParseXcodeSDK(comp_unit);
+ return {};
+}
+
size_t SymbolFileDWARFDebugMap::ParseFunctions(CompileUnit &comp_unit) {
std::lock_guard<std::recursive_mutex> guard(GetModuleMutex());
SymbolFileDWARF *oso_dwarf = GetSymbolFile(comp_unit);
Index: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
+++ lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
@@ -106,6 +106,9 @@
lldb::LanguageType
ParseLanguage(lldb_private::CompileUnit &comp_unit) override;
+ lldb_private::XcodeSDK
+ ParseXcodeSDK(lldb_private::CompileUnit &comp_unit) override;
+
size_t ParseFunctions(lldb_private::CompileUnit &comp_unit) override;
bool ParseLineTable(lldb_private::CompileUnit &comp_unit) override;
Index: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -664,12 +664,6 @@
const DWARFBaseDIE cu_die =
dwarf_cu.GetNonSkeletonUnit().GetUnitDIEOnly();
if (cu_die) {
- if (const char *sdk =
- cu_die.GetAttributeValueAsString(DW_AT_APPLE_sdk, nullptr)) {
- const char *sysroot =
- cu_die.GetAttributeValueAsString(DW_AT_LLVM_sysroot, "");
- module_sp->RegisterXcodeSDK(sdk, sysroot);
- }
FileSpec cu_file_spec(cu_die.GetName(), dwarf_cu.GetPathStyle());
MakeAbsoluteAndRemap(cu_file_spec, dwarf_cu, module_sp);
@@ -778,6 +772,22 @@
return eLanguageTypeUnknown;
}
+XcodeSDK SymbolFileDWARF::ParseXcodeSDK(CompileUnit &comp_unit) {
+ std::lock_guard<std::recursive_mutex> guard(GetModuleMutex());
+ if (DWARFUnit *dwarf_cu = GetDWARFCompileUnit(&comp_unit))
+ if (ModuleSP module_sp = m_objfile_sp->GetModule())
+ if (const DWARFBaseDIE cu_die =
+ dwarf_cu->GetNonSkeletonUnit().GetUnitDIEOnly())
+ if (const char *sdk =
+ cu_die.GetAttributeValueAsString(DW_AT_APPLE_sdk, nullptr)) {
+ const char *sysroot =
+ cu_die.GetAttributeValueAsString(DW_AT_LLVM_sysroot, "");
+ module_sp->RegisterXcodeSDK(sdk, sysroot);
+ return {sdk};
+ }
+ return {};
+}
+
size_t SymbolFileDWARF::ParseFunctions(CompileUnit &comp_unit) {
static Timer::Category func_cat(LLVM_PRETTY_FUNCTION);
Timer scoped_timer(func_cat, "SymbolFileDWARF::ParseFunctions");
Index: lldb/source/Core/Module.cpp
===================================================================
--- lldb/source/Core/Module.cpp
+++ lldb/source/Core/Module.cpp
@@ -1600,7 +1600,6 @@
XcodeSDK sdk(sdk_name.str());
if (m_xcode_sdk == sdk)
return;
- m_xcode_sdk.Merge(sdk);
PlatformSP module_platform =
Platform::GetPlatformForArchitecture(GetArchitecture(), nullptr);
ConstString sdk_path(module_platform->GetSDKPath(sdk));
Index: lldb/include/lldb/Symbol/SymbolFile.h
===================================================================
--- lldb/include/lldb/Symbol/SymbolFile.h
+++ lldb/include/lldb/Symbol/SymbolFile.h
@@ -18,6 +18,7 @@
#include "lldb/Symbol/Type.h"
#include "lldb/Symbol/TypeList.h"
#include "lldb/Symbol/TypeSystem.h"
+#include "lldb/Utility/XcodeSDK.h"
#include "lldb/lldb-private.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/Support/Errc.h"
@@ -128,6 +129,8 @@
Symtab *GetSymtab();
virtual lldb::LanguageType ParseLanguage(CompileUnit &comp_unit) = 0;
+ /// Return the Xcode SDK comp_unit was compiled against.
+ virtual XcodeSDK ParseXcodeSDK(CompileUnit &comp_unit) { return {}; }
virtual size_t ParseFunctions(CompileUnit &comp_unit) = 0;
virtual bool ParseLineTable(CompileUnit &comp_unit) = 0;
virtual bool ParseDebugMacros(CompileUnit &comp_unit) = 0;
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
