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

Move empty atom check to target independent code. NFC. 

Turns out that checking only x86 for empty atoms to fix UBSan then
requires the same code in the other targets too.  Better to just
check this in the main run loop instead of in each target.

Should be NFC, other than fixing UBSan failures.

llvm-svn: 264116
This commit is contained in:
Pete Cooper 2016-03-22 23:07:34 +00:00
parent b9a9d7163f
commit 10bf15ee8e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp
View File

@ -420,11 +420,6 @@ void ArchHandler_x86::generateAtomContent(const DefinedAtom &atom,
FindAddressForAtom findSectionAddress, FindAddressForAtom findSectionAddress,
uint64_t imageBaseAddress, uint64_t imageBaseAddress,
uint8_t *atomContentBuffer) { uint8_t *atomContentBuffer) {
if (!atom.size()) {
assert(atom.begin() == atom.end() &&
"Cannot have references without content");
return;
}
// Copy raw bytes. // Copy raw bytes.
memcpy(atomContentBuffer, atom.rawContent().data(), atom.size()); memcpy(atomContentBuffer, atom.rawContent().data(), atom.size());
// Apply fix-ups. // Apply fix-ups.

5
lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
View File

@ -672,6 +672,11 @@ void Util::copySectionContent(NormalizedFile &file) {
uint8_t *sectionContent = file.ownedAllocations.Allocate<uint8_t>(si->size); uint8_t *sectionContent = file.ownedAllocations.Allocate<uint8_t>(si->size);
normSect->content = llvm::makeArrayRef(sectionContent, si->size); normSect->content = llvm::makeArrayRef(sectionContent, si->size);
for (AtomInfo &ai : si->atomsAndOffsets) { for (AtomInfo &ai : si->atomsAndOffsets) {
if (!ai.atom->size()) {
assert(ai.atom->begin() == ai.atom->end() &&
"Cannot have references without content");
continue;
}
uint8_t *atomContent = reinterpret_cast<uint8_t*> uint8_t *atomContent = reinterpret_cast<uint8_t*>
(&sectionContent[ai.offsetInSection]); (&sectionContent[ai.offsetInSection]);
_archHandler.generateAtomContent(*ai.atom, r, addrForAtom, _archHandler.generateAtomContent(*ai.atom, r, addrForAtom,