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

[Francis Ricci via llvm-commits]

Author: fjricci
Date: Fri Mar  2 14:56:45 2018
New Revision: 326630

URL: http://llvm.org/viewvc/llvm-project?rev=326630&view=rev
Log:
[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.

Reviewers: rnk, glider, zturner

Subscribers: llvm-commits, aprantl

Differential Revision: https://reviews.llvm.org/D44025

Added:
    llvm/trunk/test/tools/llvm-symbolizer/split-debug.test
Modified:
    llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp

Modified: llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp?rev=326630&r1=326629&r2=326630&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp (original)
+++ llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp Fri Mar  2 14:56:45 2018
@@ -185,7 +185,7 @@ bool findDebugBinary(const std::string &
     return true;
   }
   // Try /path/to/original_binary/.debug/debuglink_name
-  DebugPath = OrigRealPath;
+  DebugPath = OrigDir;
   llvm::sys::path::append(DebugPath, ".debug", DebuglinkName);
   if (checkFileCRC(DebugPath, CRCHash)) {
     Result = DebugPath.str();

Added: llvm/trunk/test/tools/llvm-symbolizer/split-debug.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/split-debug.test?rev=326630&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-symbolizer/split-debug.test (added)
+++ llvm/trunk/test/tools/llvm-symbolizer/split-debug.test Fri Mar  2 14:56:45 2018
@@ -0,0 +1,26 @@
+#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