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

[BOLT] Fix processing PLT without relocs 

Summary:
Some binaries may not have a relocation section corresponding to PLT.
Handle them properly.

(cherry picked from FBD16477841)
This commit is contained in:
Maksim Panchenko 2019-07-24 22:08:36 -07:00
parent 98fdba2cc7
commit 6722875047
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
bolt/src/RewriteInstance.cpp
View File

@ -1653,29 +1653,32 @@ void RewriteInstance::disassemblePLT() {
}
// To get the name we have to read a relocation against the address.
for (const auto &Rel : RelaPLTSection->getSectionRef().relocations()) {
if (Rel.getType() != ELF::R_X86_64_JUMP_SLOT)
continue;
if (Rel.getOffset() == TargetAddress) {
const auto SymbolIter = Rel.getSymbol();
assert(SymbolIter != InputFile->symbol_end() &&
"non-null symbol expected");
const auto SymbolName = cantFail((*SymbolIter).getName());
std::string Name = SymbolName.str() + "@PLT";
const auto PtrSize = BC->AsmInfo->getCodePointerSize();
auto *BF = BC->createBinaryFunction(Name,
*PLTSection,
InstrAddr,
0,
/*IsSimple=*/false,
PLTSize,
PLTAlignment);
auto TargetSymbol = BC->registerNameAtAddress(SymbolName.str() + "@GOT",
TargetAddress,
PtrSize,
PLTAlignment);
BF->setPLTSymbol(TargetSymbol);
break;
if (RelaPLTSection) {
for (const auto &Rel : RelaPLTSection->getSectionRef().relocations()) {
if (Rel.getType() != ELF::R_X86_64_JUMP_SLOT)
continue;
if (Rel.getOffset() == TargetAddress) {
const auto SymbolIter = Rel.getSymbol();
assert(SymbolIter != InputFile->symbol_end() &&
"non-null symbol expected");
const auto SymbolName = cantFail((*SymbolIter).getName());
std::string Name = SymbolName.str() + "@PLT";
const auto PtrSize = BC->AsmInfo->getCodePointerSize();
auto *BF = BC->createBinaryFunction(Name,
*PLTSection,
InstrAddr,
0,
/*IsSimple=*/false,
PLTSize,
PLTAlignment);
auto TargetSymbol =
BC->registerNameAtAddress(SymbolName.str() + "@GOT",
TargetAddress,
PtrSize,
PLTAlignment);
BF->setPLTSymbol(TargetSymbol);
break;
}
}
}
}