nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Object] Remove check for BIND_OPCODE_DONE/REBASE_OPCODE_DONE.

Browse Source 
BIND_OPCODE_DONE/REBASE_OPCODE_DONE may appear at the end of the opcode array,
but they are not required to. The linker only adds them as padding to align the
opcodes to pointer size.

This fixes rdar://problem/31285560.

llvm-svn: 299104
This commit is contained in:
Juergen Ributzka
2017-03-30 19:56:50 +00:00
parent a0bd28c4d9
commit cad1249106
4 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/lib/Object/MachOObjectFile.cpp
View File

@@ -2780,12 +2780,10 @@ void MachORebaseEntry::moveNext() {
--RemainingLoopCount;
return;
}
if (Ptr >= Opcodes.end()) {
if (Opcodes.begin() != Opcodes.end() && Done != true) {
*E = malformedError("missing REBASE_OPCODE_DONE at end of opcodes");
moveToEnd();
return;
}
// REBASE_OPCODE_DONE is only used for padding if we are not aligned to
// pointer size. Therefore it is possible to reach the end without ever having
// seen REBASE_OPCODE_DONE.
if (Ptr == Opcodes.end()) {
Done = true;
return;
}
@@ -3164,12 +3162,10 @@ void MachOBindEntry::moveNext() {
--RemainingLoopCount;
return;
}
if (Ptr >= Opcodes.end()) {
if (Opcodes.begin() != Opcodes.end() && Done != true) {
*E = malformedError("missing BIND_OPCODE_DONE at end of opcodes");
moveToEnd();
return;
}
// BIND_OPCODE_DONE is only used for padding if we are not aligned to
// pointer size. Therefore it is possible to reach the end without ever having
// seen BIND_OPCODE_DONE.
if (Ptr == Opcodes.end()) {
Done = true;
return;
}