This is an archive of the discontinued LLVM Phabricator instance.

Differential D76846

[lld][ELF] Fix error message
ClosedPublic

Authored by jhenderson on Mar 26 2020, 7:17 AM.

Details

Reviewers
ruiu
grimar
MaskRay
peter.smith
• espindola
Commits
rG3ff3c6986b1a: [lld][ELF] Fix error message
Summary

The error previously talked about a "section header" but was actually referring to a program header.

Diff Detail

Event Timeline

jhenderson created this revision.Mar 26 2020, 7:17 AM
Herald added a reviewer: • espindola. · View Herald TranscriptMar 26 2020, 7:18 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: arichardson, emaste. · View Herald Transcript
grimar accepted this revision.Mar 26 2020, 7:36 AM

LGTM

This revision is now accepted and ready to land.Mar 26 2020, 7:36 AM
MaskRay accepted this revision.Mar 26 2020, 7:55 AM
Harbormaster completed remote builds in B50536: Diff 252836.Mar 26 2020, 8:06 AM
Closed by commit rG3ff3c6986b1a: [lld][ELF] Fix error message (authored by jhenderson). · Explain WhyMar 26 2020, 8:39 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
ELF/
2 lines
test/
ELF/
linkerscript/
2 lines

Diff 252865

lld/ELF/LinkerScript.cpp

Show First 20 Lines • Show All 1,217 Lines • ▼ Show 20 Lines
// zero based number of ELF header listed within PHDRS {} script block. // zero based number of ELF header listed within PHDRS {} script block.
std::vector<size_t> LinkerScript::getPhdrIndices(OutputSection *cmd) { std::vector<size_t> LinkerScript::getPhdrIndices(OutputSection *cmd) {
std::vector<size_t> ret; std::vector<size_t> ret;
for (StringRef s : cmd->phdrs) { for (StringRef s : cmd->phdrs) {
if (Optional<size_t> idx = getPhdrIndex(phdrsCommands, s)) if (Optional<size_t> idx = getPhdrIndex(phdrsCommands, s))
ret.push_back(*idx); ret.push_back(*idx);
else if (s != "NONE") else if (s != "NONE")
error(cmd->location + ": section header '" + s + error(cmd->location + ": program header '" + s +
"' is not listed in PHDRS"); "' is not listed in PHDRS");
} }
return ret; return ret;
} }
} // namespace elf } // namespace elf
} // namespace lld } // namespace lld

lld/test/ELF/linkerscript/phdrs.s

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines
# DEFHDR-NEXT: FileSize: 521 # DEFHDR-NEXT: FileSize: 521
# DEFHDR-NEXT: MemSize: 521 # DEFHDR-NEXT: MemSize: 521
# DEFHDR-NEXT: Flags [ (0x7) # DEFHDR-NEXT: Flags [ (0x7)
# DEFHDR-NEXT: PF_R (0x4) # DEFHDR-NEXT: PF_R (0x4)
# DEFHDR-NEXT: PF_W (0x2) # DEFHDR-NEXT: PF_W (0x2)
# DEFHDR-NEXT: PF_X (0x1) # DEFHDR-NEXT: PF_X (0x1)
# DEFHDR-NEXT: ] # DEFHDR-NEXT: ]
# BADHDR: {{.*}}.script:1: section header 'bar' is not listed in PHDRS # BADHDR: {{.*}}.script:1: program header 'bar' is not listed in PHDRS
# RUN: echo "PHDRS { text PT_LOAD FOOHDR; }" > %t1.script # RUN: echo "PHDRS { text PT_LOAD FOOHDR; }" > %t1.script
# RUN: not ld.lld -o /dev/null --script %t1.script %t 2>&1 | FileCheck --check-prefix=FOOHDR %s # RUN: not ld.lld -o /dev/null --script %t1.script %t 2>&1 | FileCheck --check-prefix=FOOHDR %s
# FOOHDR: error: {{.*}}.script:1: unexpected header attribute: FOOHDR # FOOHDR: error: {{.*}}.script:1: unexpected header attribute: FOOHDR
# RUN: echo "PHDRS { text PT_FOO FOOHDR; }" > %t1.script # RUN: echo "PHDRS { text PT_FOO FOOHDR; }" > %t1.script
# RUN: not ld.lld -o /dev/null --script %t1.script %t 2>&1 | FileCheck --check-prefix=PTFOO %s # RUN: not ld.lld -o /dev/null --script %t1.script %t 2>&1 | FileCheck --check-prefix=PTFOO %s
# PTFOO: invalid program header type: PT_FOO # PTFOO: invalid program header type: PT_FOO
Show All 12 Lines