This is an archive of the discontinued LLVM Phabricator instance.

Differential D70163

Warn on /align if used without /driver
ClosedPublic

Authored by ruiu on Nov 12 2019, 10:17 PM.

Details

Reviewers
thakis
Commits
rG000ff301e74b: Warn on /align if used without /driver
Summary

/align is not supposed to be used without /driver, so it makes
sense to warn if only /align is passed. MSVC link.exe warns on
this too.

Diff Detail

Event Timeline

ruiu created this revision.Nov 12 2019, 10:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 12 2019, 10:17 PM
Harbormaster completed remote builds in B40864: Diff 229006.Nov 12 2019, 10:18 PM
thakis accepted this revision.Nov 12 2019, 11:09 PM
This revision is now accepted and ready to land.Nov 12 2019, 11:09 PM
thakis added inline comments.Nov 12 2019, 11:10 PM
lld/test/COFF/align.s
2

Want to add /driver to the "normal" test?

Closed by commit rG000ff301e74b: Warn on /align if used without /driver (authored by ruiu). · Explain WhyNov 13 2019, 8:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
COFF/
2 lines
test/
COFF/
10 lines

Diff 229006

lld/COFF/Driver.cpp

Show First 20 Lines • Show All 1,456 Lines • ▼ Show 20 Linesvoid LinkerDriver::link(ArrayRef<const char *> argsArr) {
for (auto *arg : args.filtered(OPT_section)) for (auto *arg : args.filtered(OPT_section))
parseSection(arg->getValue()); parseSection(arg->getValue());
// Handle /align // Handle /align
if (auto *arg = args.getLastArg(OPT_align)) { if (auto *arg = args.getLastArg(OPT_align)) {
parseNumbers(arg->getValue(), &config->align); parseNumbers(arg->getValue(), &config->align);
if (!isPowerOf2_64(config->align)) if (!isPowerOf2_64(config->align))
error("/align: not a power of two: " + StringRef(arg->getValue())); error("/align: not a power of two: " + StringRef(arg->getValue()));
if (!args.hasArg(OPT_driver))
warn("/align specified without /driver; image may not run");
} }
// Handle /aligncomm // Handle /aligncomm
for (auto *arg : args.filtered(OPT_aligncomm)) for (auto *arg : args.filtered(OPT_aligncomm))
parseAligncomm(arg->getValue()); parseAligncomm(arg->getValue());
// Handle /manifestdependency. This enables /manifest unless /manifest:no is // Handle /manifestdependency. This enables /manifest unless /manifest:no is
// also passed. // also passed.
▲ Show 20 Lines • Show All 508 Lines • Show Last 20 Lines

lld/test/COFF/align.s

# RUN: yaml2obj < %s > %t.obj # RUN: yaml2obj < %s > %t.obj
# RUN: lld-link /out:%t.exe /entry:main /align:32 %t.obj # RUN: lld-link /out:%t.exe /entry:main /align:32 %t.obj
thakisUnsubmitted
Not Done
ReplyInline Actions

Want to add /driver to the "normal" test?

thakis: Want to add /driver to the "normal" test?
# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s # RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
# CHECK: SectionAlignment: 32 # CHECK: SectionAlignment: 32
# RUN: lld-link /out:%t.exe /entry:main /align:32 %t.obj 2>&1 \
# RUN: | FileCheck -check-prefix=WARN1 %s
# WARN1: /align specified without /driver; image may not run
# RUN: lld-link /out:%t.exe /entry:main /align:32 %t.obj /driver 2>&1 \
# RUN: | FileCheck -check-prefix=WARN2 --allow-empty %s
# WARN2-NOT: /align specified without /driver; image may not run
--- !COFF --- !COFF
header: header:
Machine: IMAGE_FILE_MACHINE_AMD64 Machine: IMAGE_FILE_MACHINE_AMD64
Characteristics: [] Characteristics: []
sections: sections:
- Name: .text - Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ] Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 4096 Alignment: 4096
Show All 31 Lines