This is an archive of the discontinued LLVM Phabricator instance.

Differential D43880

Fix linker script operator precedence.
ClosedPublic

Authored by ruiu on Feb 28 2018, 10:10 AM.

Details

Reviewers
• espindola
grimar
Commits
rGaa92fca83c76: Fix linker script operator precedence.
rLLD327684: Fix linker script operator precedence.
rL327684: Fix linker script operator precedence.
Summary

"&" should have higher priority than "|" [1]. Previously,
they had the same priority.

[1] https://sourceware.org/binutils/docs/ld/Operators.html

Diff Detail

Repository
rL LLVM

Event Timeline

ruiu created this revision.Feb 28 2018, 10:10 AM
Herald added subscribers: arichardson, emaste. · View Herald TranscriptFeb 28 2018, 10:10 AM
Harbormaster completed remote builds in B15528: Diff 136326.Feb 28 2018, 10:10 AM
ruiu added a comment.Mar 5 2018, 3:59 PM

Ping

• espindola edited reviewers, added: • espindola; removed: • rafael.Mar 15 2018, 8:34 AM
ruiu added a reviewer: grimar.Mar 15 2018, 1:15 PM
• espindola accepted this revision.Mar 15 2018, 2:02 PM

LGTM

This revision is now accepted and ready to land.Mar 15 2018, 2:02 PM
Closed by commit rL327684: Fix linker script operator precedence. (authored by ruiu). · Explain WhyMar 15 2018, 4:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
ELF/
11 lines
test/
ELF/
linkerscript/
4 lines

Diff 138647

lld/trunk/ELF/ScriptParser.cpp

Show First 20 Lines • Show All 463 Lines • ▼ Show 20 Linesvoid ScriptParser::readSections() {
} }
Script->SectionCommands.insert(Script->SectionCommands.end(), V.begin(), Script->SectionCommands.insert(Script->SectionCommands.end(), V.begin(),
V.end()); V.end());
} }
static int precedence(StringRef Op) { static int precedence(StringRef Op) {
return StringSwitch<int>(Op) return StringSwitch<int>(Op)
.Cases("*", "/", "%", 5) .Cases("*", "/", "%", 6)
.Cases("+", "-", 4) .Cases("+", "-", 5)
.Cases("<<", ">>", 3) .Cases("<<", ">>", 4)
.Cases("<", "<=", ">", ">=", "==", "!=", 2) .Cases("<", "<=", ">", ">=", "==", "!=", 3)
.Cases("&", "|", 1) .Case("&", 2)
.Case("|", 1)
.Default(-1); .Default(-1);
} }
StringMatcher ScriptParser::readFilePatterns() { StringMatcher ScriptParser::readFilePatterns() {
std::vector<StringRef> V; std::vector<StringRef> V;
while (!errorCount() && !consume(")")) while (!errorCount() && !consume(")"))
V.push_back(next()); V.push_back(next());
return StringMatcher(V); return StringMatcher(V);
▲ Show 20 Lines • Show All 908 Lines • Show Last 20 Lines

lld/trunk/test/ELF/linkerscript/operators.test

Show All 20 LinesSECTIONS {
greatereq = 1 >= 1 ? 1 : 2; greatereq = 1 >= 1 ? 1 : 2;
eq = 1 == 1 ? 1 : 2; eq = 1 == 1 ? 1 : 2;
neq = 1 != 1 ? 1 : 2; neq = 1 != 1 ? 1 : 2;
plusassign = 1; plusassign = 1;
plusassign += 2; plusassign += 2;
unary = -1 + 3; unary = -1 + 3;
lshift = 1 << 5; lshift = 1 << 5;
rshift = 0xff >> 3; rshift = 0xff >> 3;
precedence1 = 1 | 0xff & 1 << 1 + 1 * 2;
precedence2 = (1 | (0xff & (1 << (1 + (1 * 2)))));
maxpagesize = CONSTANT (MAXPAGESIZE); maxpagesize = CONSTANT (MAXPAGESIZE);
commonpagesize = CONSTANT (COMMONPAGESIZE); commonpagesize = CONSTANT (COMMONPAGESIZE);
. = 0xfff0; . = 0xfff0;
datasegmentalign = DATA_SEGMENT_ALIGN (0xffff, 0); datasegmentalign = DATA_SEGMENT_ALIGN (0xffff, 0);
datasegmentalign2 = DATA_SEGMENT_ALIGN (0, 0); datasegmentalign2 = DATA_SEGMENT_ALIGN (0, 0);
_end = .; _end = .;
minus_rel = _end - 0x10; minus_rel = _end - 0x10;
minus_abs = _end - _start; minus_abs = _end - _start;
Show All 14 Lines
# CHECK: 00000000000002 *ABS* 00000000 greater # CHECK: 00000000000002 *ABS* 00000000 greater
# CHECK: 00000000000001 *ABS* 00000000 greatereq # CHECK: 00000000000001 *ABS* 00000000 greatereq
# CHECK: 00000000000001 *ABS* 00000000 eq # CHECK: 00000000000001 *ABS* 00000000 eq
# CHECK: 00000000000002 *ABS* 00000000 neq # CHECK: 00000000000002 *ABS* 00000000 neq
# CHECK: 00000000000003 *ABS* 00000000 plusassign # CHECK: 00000000000003 *ABS* 00000000 plusassign
# CHECK: 00000000000002 *ABS* 00000000 unary # CHECK: 00000000000002 *ABS* 00000000 unary
# CHECK: 00000000000020 *ABS* 00000000 lshift # CHECK: 00000000000020 *ABS* 00000000 lshift
# CHECK: 0000000000001f *ABS* 00000000 rshift # CHECK: 0000000000001f *ABS* 00000000 rshift
# CHECK: 00000000000009 *ABS* 00000000 precedence1
# CHECK: 00000000000009 *ABS* 00000000 precedence2
# CHECK: 00000000001000 *ABS* 00000000 maxpagesize # CHECK: 00000000001000 *ABS* 00000000 maxpagesize
# CHECK: 00000000001000 *ABS* 00000000 commonpagesize # CHECK: 00000000001000 *ABS* 00000000 commonpagesize
# CHECK: 0000000000ffff *ABS* 00000000 datasegmentalign # CHECK: 0000000000ffff *ABS* 00000000 datasegmentalign
# CHECK: 0000000000fff0 *ABS* 00000000 datasegmentalign2 # CHECK: 0000000000fff0 *ABS* 00000000 datasegmentalign2
# CHECK: 0000000000ffe0 .text 00000000 minus_rel # CHECK: 0000000000ffe0 .text 00000000 minus_rel
# CHECK: 0000000000fff0 *ABS* 00000000 minus_abs # CHECK: 0000000000fff0 *ABS* 00000000 minus_abs
## Mailformed number error. ## Mailformed number error.
Show All 40 Lines