[llvm] r347601 - [cfi] Help sanstats to find binary if they are not at the original location

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Mon Nov 26 13:48:55 2018
New Revision: 347601

URL: http://llvm.org/viewvc/llvm-project?rev=347601&view=rev
Log:
[cfi] Help sanstats to find binary if they are not at the original location

Summary:
By default sanstats search binaries at the same location where they were when
stats was collected. Sometime you can not print report immediately or you need
to move post-processing to another workstation. To support this use-case when
original binary is missing sanstats will fall-back to directory with sanstats
file.

Reviewers: pcc

Subscribers: llvm-commits

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

Modified:
    llvm/trunk/test/tools/sanstats/elf.test
    llvm/trunk/tools/sanstats/sanstats.cpp

Modified: llvm/trunk/test/tools/sanstats/elf.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/sanstats/elf.test?rev=347601&r1=347600&r2=347601&view=diff
==============================================================================
--- llvm/trunk/test/tools/sanstats/elf.test (original)
+++ llvm/trunk/test/tools/sanstats/elf.test Mon Nov 26 13:48:55 2018
@@ -25,6 +25,16 @@
 
 # RUN: sanstats %t.stats | FileCheck %s
 
+# Test that if binaries are not in the original location then sanstats
+# searches them next to the stats file.
+# RUN: mkdir -p %t.dir
+# RUN: mv -f %t1.o %t2.o %t.dir
+# RUN: sanstats %t.stats | FileCheck %s --check-prefix=INVALID
+# RUN: mv -f %t.stats %t.dir/copy.stats
+# RUN: cd %t.dir && sanstats copy.stats | FileCheck %s
+
+# INVALID: <invalid>
+# CHECK-NOT: <invalid>
 # 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

Modified: llvm/trunk/tools/sanstats/sanstats.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/sanstats/sanstats.cpp?rev=347601&r1=347600&r2=347601&view=diff
==============================================================================
--- llvm/trunk/tools/sanstats/sanstats.cpp (original)
+++ llvm/trunk/tools/sanstats/sanstats.cpp Mon Nov 26 13:48:55 2018
@@ -15,7 +15,9 @@
 #include "llvm/DebugInfo/Symbolize/Symbolize.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorOr.h"
+#include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/Path.h"
 #include "llvm/Transforms/Utils/SanitizerStats.h"
 #include <stdint.h>
 
@@ -52,7 +54,11 @@ const char *ReadModule(char SizeofPtr, c
     ++Begin;
   if (Begin == End)
     return nullptr;
-  StringRef Filename(FilenameBegin, Begin - FilenameBegin);
+  std::string Filename(FilenameBegin, Begin - FilenameBegin);
+
+  if (!llvm::sys::fs::exists(Filename))
+    Filename = std::string(llvm::sys::path::parent_path(ClInputFile)) +
+               std::string(llvm::sys::path::filename(Filename));
 
   ++Begin;
   if (Begin == End)