maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-xray] Store offset pointers in temporaries 

DataExtractor::getU64 modifies the OffsetPtr which also pass to
RelocateOrElse which breaks on Windows. This addresses the issue
introduced in r349120.

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

llvm-svn: 349129
This commit is contained in:
Petr Hosek 2018-12-14 05:56:20 +00:00
parent f03e8023b7
commit 27e2f2014a
1 changed files with 4 additions and 2 deletions

6
llvm/lib/XRay/InstrumentationMap.cpp
View File

@ -137,8 +137,10 @@ loadObj(StringRef Filename, object::OwningBinary<object::ObjectFile> &ObjFile,
Sleds.push_back({});
auto &Entry = Sleds.back();
uint32_t OffsetPtr = 0;
Entry.Address = RelocateOrElse(OffsetPtr, Extractor.getU64(&OffsetPtr));
Entry.Function = RelocateOrElse(OffsetPtr, Extractor.getU64(&OffsetPtr));
uint32_t AddrPtr = OffsetPtr;
Entry.Address = RelocateOrElse(AddrOff, Extractor.getU64(&OffsetPtr));
uint32_t FuncPtr = OffsetPtr;
Entry.Function = RelocateOrElse(FuncOff, Extractor.getU64(&OffsetPtr));
auto Kind = Extractor.getU8(&OffsetPtr);
static constexpr SledEntry::FunctionKinds Kinds[] = {
SledEntry::FunctionKinds::ENTRY, SledEntry::FunctionKinds::EXIT,