Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-30 21:56:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "[ELF] Allow getErrPlace() to work before Out::bufferStart is set"

Browse Source 
This reverts commit 2bbd32f5e8f0f62d895966e2623d9bdb9778b50b, it was
causing UBSan failures like the following:
lld/ELF/Target.cpp:103:41: runtime error: applying non-zero offset 24 to null pointer
This commit is contained in:
Vlad Tsyrklevich 2019-12-13 09:43:51 -08:00
parent d53e61863d
commit 17063abd1e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lld/ELF/Target.cpp
View File

@ -91,15 +91,15 @@ TargetInfo *getTarget() {
}
template <class ELFT> static ErrorPlace getErrPlace(const uint8_t *loc) {
if (!Out::bufferStart)
return {};
for (InputSectionBase *d : inputSections) {
auto *isec = cast<InputSection>(d);
if (!isec->getParent())
continue;
const uint8_t *isecLoc =
Out::bufferStart
? (Out::bufferStart + isec->getParent()->offset + isec->outSecOff)
: isec->data().data();
uint8_t *isecLoc = Out::bufferStart + isec->getParent()->offset + isec->outSecOff;
if (isecLoc <= loc && loc < isecLoc + isec->getSize())
return {isec, isec->template getLocation<ELFT>(loc - isecLoc) + ": "};
}

4
lld/test/ELF/mips-jalr-non-functions.s
View File

@ -15,13 +15,13 @@ test:
.Ltmp1:
jr $t9
nop
# WARNING-MESSAGE: warning: {{.+}}.tmp.o:(.text+0x0): found R_MIPS_JALR relocation against non-function symbol tls_obj. This is invalid and most likely a compiler bug.
# WARNING-MESSAGE: warning: found R_MIPS_JALR relocation against non-function symbol tls_obj. This is invalid and most likely a compiler bug.
.reloc .Ltmp2, R_MIPS_JALR, reg_obj
.Ltmp2:
jr $t9
nop
# WARNING-MESSAGE: warning: {{.+}}.tmp.o:(.text+0x8): found R_MIPS_JALR relocation against non-function symbol reg_obj. This is invalid and most likely a compiler bug.
# WARNING-MESSAGE: warning: found R_MIPS_JALR relocation against non-function symbol reg_obj. This is invalid and most likely a compiler bug.
.reloc .Ltmp3, R_MIPS_JALR, untyped
.Ltmp3: