LNT: Only use text segment when isSO

[tnfchris]

Summary

Limit the segment calculation uses to only when the binary is relocatable.

[tschuett]

lnt/testing/profile/cPerf.cpp

535

This not LLVM style. Move the first bracket up to the if statement.

[tnfchris]

change brace style

[tnfchris]

ping

[thopre]

LGTM with the suggested codestyle changes

lnt/testing/profile/cPerf.cpp

536–538

LLVM code style does not use tab. Can you change those 3 lines to use whitespaces instead?

lnt/testing/profile/cPerf.cpp

 };
 
 //===----------------------------------------------------------------------===//
 // Readers for objdump output
 //===----------------------------------------------------------------------===//
 
 struct Map {
   uint64_t Start, End, Adjust;
+  bool isSO;
   const char *Filename;
 };
 
 struct EventDesc {
   uint64_t Start;
   uint64_t End;
   size_t MapId;
 };
#else
     fclose(Stream);
     wait(NULL);
 #endif
   }
 
   void reset(Map *M) {
     clear();
     // Fetch both dynamic and static symbols, sort and unique them.
+    /* If we're a relocatable object then take the actual start of the text
+       segment into account.  */
+    if (M->isSO) {
         uint64_t segmentStart = fetchExecSegment (M);
         /* Adjust the symbol to a value relative to the start of the load address
             to match up with registerNewMapping.  */
         M->Adjust -= segmentStart;
+    }
     fetchSymbols(M);
     
     std::sort(begin(), end());
     auto NewEnd = std::unique(begin(), end());
     erase(NewEnd, end());
   }
 
 protected:
void PerfReader::registerNewMapping(unsigned char *Buf, const char *Filename) {
   perf_event_mmap_common *E = (perf_event_mmap_common *)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(BinaryCacheRoot + std::string(Filename));
   uint64_t End = E->start + E->extent;
   uint64_t Adjust = IsSO ? E->start - E->pgoff : 0;
-  Maps.push_back({E->start, End, Adjust, Filename});
+  Maps.push_back({E->start, End, Adjust, IsSO, Filename});
 
   unsigned char *EndOfEvent = Buf + E->header.size;
   // FIXME: The first EventID is used for every event.
   // FIXME: The code assumes perf_event_attr.sample_id_all is set.
   uint64_t Time = getTimeFromSampleId(EndOfEvent, EventLayouts.begin()->second);
   auto &CurrentMap = CurrentMaps[Time];
   CurrentMap.insert({E->start, { E->start, End, MapID}});
 }