This is an archive of the discontinued LLVM Phabricator instance.

Differential D97078

[lld-macho] Use full input file name in invalid relocation error message
ClosedPublic

Authored by int3 on Feb 19 2021, 12:16 PM.

Details

Reviewers
thakis
Group Reviewers
Restricted Project
Commits
rGe5d780e049c2: [lld-macho] Use full input file name in invalid relocation error message
Summary

Just something I noticed while debugging arm relocations...

Diff Detail

Unit TestsFailed

TimeTest
60 msx64 debian > lld.MachO/invalid::invalid-relocation-pcrel.yaml
140 msx64 windows > lld.MachO/invalid::invalid-relocation-pcrel.yaml

Event Timeline

int3 created this revision.Feb 19 2021, 12:16 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 19 2021, 12:16 PM
Herald added a subscriber: kristof.beyls. · View Herald Transcript
int3 requested review of this revision.Feb 19 2021, 12:16 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 19 2021, 12:16 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B89964: Diff 325060.Feb 19 2021, 12:54 PM
int3 updated this revision to Diff 325113.Feb 19 2021, 4:33 PM

fix test

Harbormaster completed remote builds in B89994: Diff 325113.Feb 19 2021, 5:15 PM
thakis accepted this revision.Feb 23 2021, 7:01 AM
thakis added a subscriber: thakis.

More use of toString() is always good :)

This revision is now accepted and ready to land.Feb 23 2021, 7:01 AM
Closed by commit rGe5d780e049c2: [lld-macho] Use full input file name in invalid relocation error message (authored by int3). · Explain WhyFeb 23 2021, 7:02 PM
This revision was automatically updated to reflect the committed changes.
int3 added a commit: rGe5d780e049c2: [lld-macho] Use full input file name in invalid relocation error message.

Revision Contents

PathSize
lld/
MachO/
8 lines
test/
MachO/
invalid/
8 lines

Diff 325060

lld/MachO/InputFiles.cpp

Show First 20 Lines • Show All 197 Lines • ▼ Show 20 Lines
// subsection. // subsection.
static InputSection *findContainingSubsection(SubsectionMap &map, static InputSection *findContainingSubsection(SubsectionMap &map,
uint32_t *offset) { uint32_t *offset) {
auto it = std::prev(map.upper_bound(*offset)); auto it = std::prev(map.upper_bound(*offset));
*offset -= it->first; *offset -= it->first;
return it->second; return it->second;
} }
static bool validateRelocationInfo(MemoryBufferRef mb, const section_64 &sec, static bool validateRelocationInfo(InputFile *file, const section_64 &sec,
relocation_info rel) { relocation_info rel) {
const TargetInfo::RelocAttrs &relocAttrs = target->getRelocAttrs(rel.r_type); const TargetInfo::RelocAttrs &relocAttrs = target->getRelocAttrs(rel.r_type);
bool valid = true; bool valid = true;
auto message = [relocAttrs, mb, sec, rel, &valid](const Twine &diagnostic) { auto message = [relocAttrs, file, sec, rel, &valid](const Twine &diagnostic) {
valid = false; valid = false;
return (relocAttrs.name + " relocation " + diagnostic + " at offset " + return (relocAttrs.name + " relocation " + diagnostic + " at offset " +
std::to_string(rel.r_address) + " of " + sec.segname + "," + std::to_string(rel.r_address) + " of " + sec.segname + "," +
sec.sectname + " in " + mb.getBufferIdentifier()) sec.sectname + " in " + toString(file))
.str(); .str();
}; };
if (!relocAttrs.hasAttr(RelocAttrBits::LOCAL) && !rel.r_extern) if (!relocAttrs.hasAttr(RelocAttrBits::LOCAL) && !rel.r_extern)
error(message("must be extern")); error(message("must be extern"));
if (relocAttrs.hasAttr(RelocAttrBits::PCREL) != rel.r_pcrel) if (relocAttrs.hasAttr(RelocAttrBits::PCREL) != rel.r_pcrel)
error(message(Twine("must ") + (rel.r_pcrel ? "not " : "") + error(message(Twine("must ") + (rel.r_pcrel ? "not " : "") +
"be PC-relative")); "be PC-relative"));
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Lines for (size_t i = 0; i < relInfos.size(); i++) {
uint64_t pairedAddend = 0; uint64_t pairedAddend = 0;
relocation_info relInfo = relInfos[i]; relocation_info relInfo = relInfos[i];
if (target->hasAttr(relInfo.r_type, RelocAttrBits::ADDEND)) { if (target->hasAttr(relInfo.r_type, RelocAttrBits::ADDEND)) {
pairedAddend = SignExtend64<24>(relInfo.r_symbolnum); pairedAddend = SignExtend64<24>(relInfo.r_symbolnum);
relInfo = relInfos[++i]; relInfo = relInfos[++i];
} }
assert(i < relInfos.size()); assert(i < relInfos.size());
if (!validateRelocationInfo(mb, sec, relInfo)) if (!validateRelocationInfo(this, sec, relInfo))
continue; continue;
if (relInfo.r_address & R_SCATTERED) if (relInfo.r_address & R_SCATTERED)
fatal("TODO: Scattered relocations not supported"); fatal("TODO: Scattered relocations not supported");
uint64_t embeddedAddend = target->getEmbeddedAddend(mb, sec, relInfo); uint64_t embeddedAddend = target->getEmbeddedAddend(mb, sec, relInfo);
assert(!(embeddedAddend && pairedAddend)); assert(!(embeddedAddend && pairedAddend));
uint64_t totalAddend = pairedAddend + embeddedAddend; uint64_t totalAddend = pairedAddend + embeddedAddend;
Reloc p; Reloc p;
▲ Show 20 Lines • Show All 509 Lines • Show Last 20 Lines

lld/test/MachO/invalid/invalid-relocation-pcrel.yaml

# REQUIRES: x86 # REQUIRES: x86
# RUN: yaml2obj %s -o %t.o # RUN: rm -rf %t; mkdir %t
# RUN: not %lld -o %t %t.o 2>&1 | FileCheck %s -DFILE=%t.o # RUN: yaml2obj %s -o %t/test.o
# RUN: llvm-ar rcs %t/test.a %t/test.o
# RUN: not %lld -o %t %t/test.a 2>&1 | FileCheck %s
# #
# CHECK: error: UNSIGNED relocation must not be PC-relative at offset 1 of __TEXT,__text in [[FILE]] # CHECK: error: UNSIGNED relocation must not be PC-relative at offset 1 of __TEXT,__text in {{.*}}/test.a(test.o)
!mach-o !mach-o
FileHeader: FileHeader:
magic: 0xFEEDFACF magic: 0xFEEDFACF
cputype: 0x01000007 cputype: 0x01000007
cpusubtype: 0x00000003 cpusubtype: 0x00000003
filetype: 0x00000001 filetype: 0x00000001
ncmds: 4 ncmds: 4
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines