This is an archive of the discontinued LLVM Phabricator instance.

Differential D44025

[llvm-symbolizer] Use correct path when resolving .gnu_debuglink in .debug
ClosedPublic

Authored by fjricci on Mar 2 2018, 9:14 AM.

Details

Reviewers
rnk
glider
zturner
Commits
rGfe6cbceec2aa: [llvm-symbolizer] Use correct path when resolving .gnu_debuglink in .debug
rL326630: [llvm-symbolizer] Use correct path when resolving .gnu_debuglink in .debug
Summary

The symbolizer was checking for .debug as a subdirectory of the
binary file itself, not of the directory containing the binary. This led to
a failure to find split debug info when it was contained in a .debug directory.

Diff Detail

Event Timeline

fjricci created this revision.Mar 2 2018, 9:14 AM
Harbormaster completed remote builds in B15627: Diff 136771.Mar 2 2018, 9:14 AM
Herald added a subscriber: aprantl. · View Herald TranscriptMar 2 2018, 9:14 AM
rnk accepted this revision.Mar 2 2018, 11:09 AM

lgtm

lib/DebugInfo/Symbolize/Symbolize.cpp
180

I see, it's supposed to match this.

This revision is now accepted and ready to land.Mar 2 2018, 11:09 AM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptMar 2 2018, 11:09 AM
Closed by commit rL326630: [llvm-symbolizer] Use correct path when resolving .gnu_debuglink in .debug (authored by fjricci). · Explain WhyMar 2 2018, 3:00 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
DebugInfo/
Symbolize/
2 lines
test/
tools/
llvm-symbolizer/
26 lines

Diff 136771

lib/DebugInfo/Symbolize/Symbolize.cpp

Show First 20 Lines • Show All 171 Lines • ▼ Show 20 Lines
#if defined(HAVE_REALPATH) #if defined(HAVE_REALPATH)
if (char *RP = realpath(OrigPath.c_str(), nullptr)) { if (char *RP = realpath(OrigPath.c_str(), nullptr)) {
OrigRealPath = RP; OrigRealPath = RP;
free(RP); free(RP);
} }
#endif #endif
SmallString<16> OrigDir(OrigRealPath); SmallString<16> OrigDir(OrigRealPath);
llvm::sys::path::remove_filename(OrigDir); llvm::sys::path::remove_filename(OrigDir);
SmallString<16> DebugPath = OrigDir; SmallString<16> DebugPath = OrigDir;
rnkUnsubmitted
Not Done
ReplyInline Actions

I see, it's supposed to match this.

rnk: I see, it's supposed to match this.
// Try /path/to/original_binary/debuglink_name // Try /path/to/original_binary/debuglink_name
llvm::sys::path::append(DebugPath, DebuglinkName); llvm::sys::path::append(DebugPath, DebuglinkName);
if (checkFileCRC(DebugPath, CRCHash)) { if (checkFileCRC(DebugPath, CRCHash)) {
Result = DebugPath.str(); Result = DebugPath.str();
return true; return true;
} }
// Try /path/to/original_binary/.debug/debuglink_name // Try /path/to/original_binary/.debug/debuglink_name
DebugPath = OrigRealPath; DebugPath = OrigDir;
llvm::sys::path::append(DebugPath, ".debug", DebuglinkName); llvm::sys::path::append(DebugPath, ".debug", DebuglinkName);
if (checkFileCRC(DebugPath, CRCHash)) { if (checkFileCRC(DebugPath, CRCHash)) {
Result = DebugPath.str(); Result = DebugPath.str();
return true; return true;
} }
// Try /usr/lib/debug/path/to/original_binary/debuglink_name // Try /usr/lib/debug/path/to/original_binary/debuglink_name
DebugPath = "/usr/lib/debug"; DebugPath = "/usr/lib/debug";
llvm::sys::path::append(DebugPath, llvm::sys::path::relative_path(OrigDir), llvm::sys::path::append(DebugPath, llvm::sys::path::relative_path(OrigDir),
▲ Show 20 Lines • Show All 308 Lines • Show Last 20 Lines

test/tools/llvm-symbolizer/split-debug.test

  • This file was added.
#Source:
##include <stdio.h>
#static inline int inctwo (int *a) {
# printf ("%d\n",(*a)++);
# return (*a)++;
#}
#static inline int inc (int *a) {
# printf ("%d\n",inctwo(a));
# return (*a)++;
#}
#
#
#int main () {
# int x = 1;
# return inc(&x);
#}
#
#Build as : clang -g -O2 addr.c
RUN: mkdir -p %t/.debug
RUN: llvm-objcopy --keep=.debug_info %p/Inputs/addr.exe %t/.debug/addr
RUN: llvm-objcopy --strip-debug --add-gnu-debuglink=%t/.debug/addr %p/Inputs/addr.exe %t/addr.exe
RUN: llvm-symbolizer -print-address -obj=%t/addr.exe < %p/Inputs/addr.inp | FileCheck %s
#CHECK: 0x40054d
#CHECK: {{[/\]+}}tmp{{[/\]+}}x.c:14:0