This is an archive of the discontinued LLVM Phabricator instance.

Differential D110490

[ELF] Support symbol names with space in linker script expressions
ClosedPublic

Authored by MaskRay on Sep 25 2021, 4:52 PM.

Details

Reviewers
jhenderson
peter.smith
Commits
rG2bf06d9345ca: [ELF] Support symbol names with space in linker script expressions
Summary

Fix PR51961

Diff Detail

Event Timeline

MaskRay created this revision.Sep 25 2021, 4:52 PM
Herald added subscribers: arichardson, emaste. · View Herald TranscriptSep 25 2021, 4:52 PM
MaskRay requested review of this revision.Sep 25 2021, 4:52 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 25 2021, 4:52 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B125732: Diff 375072.Sep 25 2021, 5:06 PM
jhenderson accepted this revision.Sep 27 2021, 12:08 AM

LGTM!

lld/test/ELF/linkerscript/symbol-name.test
2

Perhaps worth explicitly pointing out that spaces in names are also tested.

This revision is now accepted and ready to land.Sep 27 2021, 12:08 AM
peter.smith added a comment.Sep 27 2021, 1:52 AM

Thanks for the fix, LGTM too.

MaskRay updated this revision to Diff 375310.Sep 27 2021, 9:45 AM
MaskRay marked an inline comment as done.

improve comment

This revision was landed with ongoing or failed builds.Sep 27 2021, 9:50 AM
Closed by commit rG2bf06d9345ca: [ELF] Support symbol names with space in linker script expressions (authored by MaskRay). · Explain Why
This revision was automatically updated to reflect the committed changes.
MaskRay marked an inline comment as not done.
MaskRay added a commit: rG2bf06d9345ca: [ELF] Support symbol names with space in linker script expressions.
Harbormaster completed remote builds in B125910: Diff 375310.Sep 27 2021, 10:18 AM

Revision Contents

PathSize
lld/
ELF/
5 lines
test/
ELF/
linkerscript/
6 lines

Diff 375072

lld/ELF/ScriptParser.cpp

Show First 20 Lines • Show All 1,423 Lines • ▼ Show 20 LinesExpr ScriptParser::readPrimary() {
if (tok == ".") if (tok == ".")
return [=] { return script->getSymbolValue(tok, location); }; return [=] { return script->getSymbolValue(tok, location); };
// Tok is a literal number. // Tok is a literal number.
if (Optional<uint64_t> val = parseInt(tok)) if (Optional<uint64_t> val = parseInt(tok))
return [=] { return *val; }; return [=] { return *val; };
// Tok is a symbol name. // Tok is a symbol name.
if (tok.startswith("\""))
tok = unquote(tok); tok = unquote(tok);
if (!isValidSymbolName(tok)) else if (!isValidSymbolName(tok))
setError("malformed number: " + tok); setError("malformed number: " + tok);
script->referencedSymbols.push_back(tok); script->referencedSymbols.push_back(tok);
return [=] { return script->getSymbolValue(tok, location); }; return [=] { return script->getSymbolValue(tok, location); };
} }
Expr ScriptParser::readTernary(Expr cond) { Expr ScriptParser::readTernary(Expr cond) {
Expr l = readExpr(); Expr l = readExpr();
expect(":"); expect(":");
▲ Show 20 Lines • Show All 242 Lines • Show Last 20 Lines

lld/test/ELF/linkerscript/symbol-name.test

# REQUIRES: x86 # REQUIRES: x86
## Test that ., $ and " can be used by symbol names in expressions. ## Test that ., $ and " can be used by symbol names in expressions.
jhendersonUnsubmitted
Not Done
ReplyInline Actions

Perhaps worth explicitly pointing out that spaces in names are also tested.

jhenderson: Perhaps worth explicitly pointing out that spaces in names are also tested.
# RUN: llvm-mc -filetype=obj -triple=x86_64 /dev/null -o %t.o # RUN: llvm-mc -filetype=obj -triple=x86_64 /dev/null -o %t.o
# RUN: ld.lld -T %s %t.o -o %t # RUN: ld.lld -T %s %t.o -o %t
# RUN: llvm-readelf -s %t | FileCheck %s # RUN: llvm-readelf -s %t | FileCheck %s
# CHECK: Value Size Type Bind Vis Ndx Name # CHECK: Value Size Type Bind Vis Ndx Name
# CHECK-DAG: 0000000000000000 0 NOTYPE GLOBAL DEFAULT ABS a1 # CHECK-DAG: 0000000000000000 0 NOTYPE GLOBAL DEFAULT ABS a1
# CHECK-DAG: 0000000000000000 0 NOTYPE GLOBAL DEFAULT ABS a0 # CHECK-DAG: 0000000000000000 0 NOTYPE GLOBAL DEFAULT ABS a0
# CHECK-DAG: 0000000000000003 0 NOTYPE GLOBAL DEFAULT ABS a2 # CHECK-DAG: 0000000000000003 0 NOTYPE GLOBAL DEFAULT ABS a 2
# CHECK-DAG: 0000000000000004 0 NOTYPE GLOBAL DEFAULT ABS a 3
a0 = DEFINED(.TOC.) ? .TOC. : 0; a0 = DEFINED(.TOC.) ? .TOC. : 0;
"a1" = DEFINED(__global_pointer$) ? __global_pointer$ : 0; "a1" = DEFINED(__global_pointer$) ? __global_pointer$ : 0;
"a2" = DEFINED("a1") ? "a1" + 3 : 0; "a 2" = DEFINED("a1") ? "a1" + 3 : 0;
"a 3" = "a 2" + 1;