diff options
| -rw-r--r-- | llvm/lib/DebugInfo/Symbolize/Symbolize.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-symbolizer/split-debug.test | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp index e997ef5b606..681334bc405 100644 --- a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp +++ b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp @@ -185,7 +185,7 @@ bool findDebugBinary(const std::string &OrigPath, 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(); diff --git a/llvm/test/tools/llvm-symbolizer/split-debug.test b/llvm/test/tools/llvm-symbolizer/split-debug.test new file mode 100644 index 00000000000..2d5b0732c6d --- /dev/null +++ b/llvm/test/tools/llvm-symbolizer/split-debug.test @@ -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 |
