diff options
| -rw-r--r-- | llvm/test/tools/sanstats/elf.test | 24 | ||||
| -rw-r--r-- | llvm/tools/sanstats/sanstats.cpp | 5 |
2 files changed, 15 insertions, 14 deletions
diff --git a/llvm/test/tools/sanstats/elf.test b/llvm/test/tools/sanstats/elf.test index ab90b50020f..44a1268a320 100644 --- a/llvm/test/tools/sanstats/elf.test +++ b/llvm/test/tools/sanstats/elf.test @@ -25,19 +25,19 @@ # RUN: sanstats %t.stats | FileCheck %s -# CHECK: /tmp{{[/\\]}}f.c:1 f1 cfi-vcall 1 -# CHECK: /tmp{{[/\\]}}f.c:2 f2 cfi-nvcall 2 -# CHECK: /tmp{{[/\\]}}f.c:3 f3 cfi-derived-cast 3 -# CHECK: /tmp{{[/\\]}}f.c:1 f1 cfi-unrelated-cast 4 -# CHECK: /tmp{{[/\\]}}f.c:2 f2 cfi-icall 5 -# CHECK: /tmp{{[/\\]}}f.c:3 f3 <unknown> 6 +# CHECK: 0x0000000000000000 /tmp{{[/\\]}}f.c:1 f1 cfi-vcall 1 +# CHECK: 0x0000000000000010 /tmp{{[/\\]}}f.c:2 f2 cfi-nvcall 2 +# CHECK: 0x0000000000000020 /tmp{{[/\\]}}f.c:3 f3 cfi-derived-cast 3 +# CHECK: 0x0000000000000000 /tmp{{[/\\]}}f.c:1 f1 cfi-unrelated-cast 4 +# CHECK: 0x0000000000000010 /tmp{{[/\\]}}f.c:2 f2 cfi-icall 5 +# CHECK: 0x0000000000000020 /tmp{{[/\\]}}f.c:3 f3 <unknown> 6 -# CHECK: /tmp{{[/\\]}}f.c:3 f3 cfi-vcall 7 -# CHECK: /tmp{{[/\\]}}f.c:2 f2 cfi-nvcall 8 -# CHECK: /tmp{{[/\\]}}f.c:1 f1 cfi-derived-cast 9 -# CHECK: /tmp{{[/\\]}}f.c:3 f3 cfi-unrelated-cast 11 -# CHECK: /tmp{{[/\\]}}f.c:2 f2 cfi-icall 12 -# CHECK: /tmp{{[/\\]}}f.c:1 f1 <unknown> 14 +# CHECK: 0x0000000000000020 /tmp{{[/\\]}}f.c:3 f3 cfi-vcall 7 +# CHECK: 0x0000000000000010 /tmp{{[/\\]}}f.c:2 f2 cfi-nvcall 8 +# CHECK: 0x0000000000000000 /tmp{{[/\\]}}f.c:1 f1 cfi-derived-cast 9 +# CHECK: 0x0000000000000020 /tmp{{[/\\]}}f.c:3 f3 cfi-unrelated-cast 11 +# CHECK: 0x0000000000000010 /tmp{{[/\\]}}f.c:2 f2 cfi-icall 12 +# CHECK: 0x0000000000000000 /tmp{{[/\\]}}f.c:1 f1 <unknown> 14 --- !ELF FileHeader: diff --git a/llvm/tools/sanstats/sanstats.cpp b/llvm/tools/sanstats/sanstats.cpp index 71f0207bab5..214aeeab5ab 100644 --- a/llvm/tools/sanstats/sanstats.cpp +++ b/llvm/tools/sanstats/sanstats.cpp @@ -81,8 +81,9 @@ const char *ReadModule(char SizeofPtr, const char *Begin, const char *End) { // remove one from the address to get the correct DI. if (Expected<DILineInfo> LineInfo = Symbolizer.symbolizeCode(Filename, Addr - 1)) { - llvm::outs() << LineInfo->FileName << ':' << LineInfo->Line << ' ' - << LineInfo->FunctionName << ' '; + llvm::outs() << format_hex(Addr - 1, 18) << ' ' << LineInfo->FileName + << ':' << LineInfo->Line << ' ' << LineInfo->FunctionName + << ' '; } else { logAllUnhandledErrors(LineInfo.takeError(), llvm::outs(), "<error> "); } |
