Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-27 07:31:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "[lldb] Don't process symlinks deep inside DWARFUnit"

Browse Source 
This temporarily reverts commit 3cfb6677b2
because it breaks TestCompDirSymLink.py on macOS.
This commit is contained in:
Jonas Devlieghere 2019-12-23 18:03:35 -08:00
parent 379613d7c7
commit ebcb36d4a1
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
View File

@ -716,6 +716,25 @@ removeHostnameFromPathname(llvm::StringRef path_from_dwarf) {
return path;
}
static FileSpec resolveCompDir(const FileSpec &path) {
bool is_symlink = SymbolFileDWARF::GetSymlinkPaths().FindFileIndex(
0, path, /*full*/ true) != UINT32_MAX;
if (!is_symlink)
return path;
namespace fs = llvm::sys::fs;
if (fs::get_file_type(path.GetPath(), false) != fs::file_type::symlink_file)
return path;
FileSpec resolved_symlink;
const auto error = FileSystem::Instance().Readlink(path, resolved_symlink);
if (error.Success())
return resolved_symlink;
return path;
}
void DWARFUnit::ComputeCompDirAndGuessPathStyle() {
m_comp_dir = FileSpec();
const DWARFDebugInfoEntry *die = GetUnitDIEPtrOnly();
@ -727,7 +746,7 @@ void DWARFUnit::ComputeCompDirAndGuessPathStyle() {
if (!comp_dir.empty()) {
FileSpec::Style comp_dir_style =
FileSpec::GuessPathStyle(comp_dir).getValueOr(FileSpec::Style::native);
m_comp_dir = FileSpec(comp_dir, comp_dir_style);
m_comp_dir = resolveCompDir(FileSpec(comp_dir, comp_dir_style));
} else {
// Try to detect the style based on the DW_AT_name attribute, but just store
// the detected style in the m_comp_dir field.

11
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
View File

@ -453,17 +453,6 @@ SymbolFileDWARF::GetTypeSystemForLanguage(LanguageType language) {
void SymbolFileDWARF::InitializeObject() {
Log *log = LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_INFO);
Module &module = *GetObjectFile()->GetModule();
for (const FileSpec &symlink : GetSymlinkPaths()) {
FileSpec resolved;
Status status = FileSystem::Instance().Readlink(symlink, resolved);
if (status.Success())
module.GetSourceMappingList().Append(ConstString(symlink.GetPath()),
ConstString(resolved.GetPath()),
/*notify=*/true);
}
if (!GetGlobalPluginProperties()->IgnoreFileIndexes()) {
DWARFDataExtractor apple_names, apple_namespaces, apple_types, apple_objc;
LoadSectionData(eSectionTypeDWARFAppleNames, apple_names);