Use BinaryCacheRoot calling IsSharedObject()

[kpdev42]

Summary

https://reviews.llvm.org/D110839 introduced BinaryCacheRoot.
It must be used calling IsSharedObject() too.

OS Laboratory, Huawei Russian Research Institute (Saint-Petersburg)

[thopre]

LGTM

[danilaml]

lnt/testing/profile/cPerf.cpp

135

could be const &

lnt/testing/profile/cPerf.cpp

if (Expr)
     return;
   char Str[512];
   sprintf(Str, "%s (%s:%d)", ExprStr, File, Line);
   throw std::logic_error(Str);
 }
 
 // Returns true if the ELF file given by filename
 // is a shared object (DYN).
-bool IsSharedObject(char *Fname) {
+bool IsSharedObject(const std::string &Fname) {
   // We replicate the first part of an ELF header here
   // so as not to rely on <elf.h>.
   struct PartialElfHeader {
     unsigned char e_ident[16];
     uint16_t e_type;
   };
   const int ET_DYN = 3;
 
-  FILE *stream = fopen(Fname, "r");
+  FILE *stream = fopen(Fname.c_str(), "r");
   if (stream == NULL)
     return false;
 
   PartialElfHeader H;
   auto NumRead = fread(&H, 1, sizeof(H), stream);
   assert(NumRead == sizeof(H));
 
   fclose(stream);
unsigned char *PerfReader::readEvent(unsigned char *Buf) {
   switch (E->type) {
   case PERF_RECORD_MMAP:
   {
     perf_event_mmap *E = (perf_event_mmap *)Buf;
     auto MapID = Maps.size();
     // EXEC ELF objects aren't relocated. DYN ones are,
     // so if it's a DYN object adjust by subtracting the
     // map base.
-    bool IsSO = IsSharedObject(E->filename);
+    bool IsSO = IsSharedObject(BinaryCacheRoot + std::string(E->filename));
     Maps.push_back({E->start, E->start + E->extent,
                     IsSO ? E->start - E->pgoff : 0, E->filename});
 
     // FIXME: use EventLayouts.begin()->second!
     perf_sample_id *ID =
         (perf_sample_id *)(Buf + E->header.size - sizeof(perf_sample_id));
     auto &CurrentMap = CurrentMaps[ID->time];
     CurrentMap.insert({E->start, MapID});
   }
   break;
   case PERF_RECORD_MMAP2:
   {
     perf_event_mmap2 *E = (perf_event_mmap2 *)Buf;
     if (!(E->prot & PROT_EXEC))
       break;
     auto MapID = Maps.size();
     // EXEC ELF objects aren't relocated. DYN ones are,
     // so if it's a DYN object adjust by subtracting the
     // map base.
-    bool IsSO = IsSharedObject(E->filename);
+    bool IsSO = IsSharedObject(BinaryCacheRoot + std::string(E->filename));
     Maps.push_back({E->start, E->start + E->extent,
                     IsSO ? E->start - E->pgoff : 0, E->filename});
 
     // FIXME: use EventLayouts.begin()->second!
     perf_sample_id *ID =
         (perf_sample_id *)(Buf + E->header.size - sizeof(perf_sample_id));
     auto &CurrentMap = CurrentMaps[ID->time];
     CurrentMap.insert({E->start, MapID});