maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use SectionBase for linker script expressions. 

This is a small step for fixing pr32031, which needs expressions that
point to input sections.

llvm-svn: 297431
This commit is contained in:
Rafael Espindola 2017-03-10 00:47:33 +00:00
parent 0666a76aac
commit 9bd4566dac
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/ELF/LinkerScript.cpp
View File

@ -63,7 +63,7 @@ template <class ELFT> static SymbolBody *addRegular(SymbolAssignment *Cmd) {
Cmd->Name, /*Type*/ 0, Visibility, /*CanOmitFromDynSym*/ false, Cmd->Name, /*Type*/ 0, Visibility, /*CanOmitFromDynSym*/ false,
/*File*/ nullptr); /*File*/ nullptr);
Sym->Binding = STB_GLOBAL; Sym->Binding = STB_GLOBAL;
OutputSection *Sec = SectionBase *Sec =
Cmd->Expression.IsAbsolute() ? nullptr : Cmd->Expression.Section(); Cmd->Expression.IsAbsolute() ? nullptr : Cmd->Expression.Section();
replaceBody<DefinedRegular>(Sym, Cmd->Name, /*IsLocal=*/false, Visibility, replaceBody<DefinedRegular>(Sym, Cmd->Name, /*IsLocal=*/false, Visibility,
STT_NOTYPE, 0, 0, Sec, nullptr); STT_NOTYPE, 0, 0, Sec, nullptr);
@ -1617,7 +1617,7 @@ Expr ScriptParser::readExpr() {
static Expr combine(StringRef Op, Expr L, Expr R) { static Expr combine(StringRef Op, Expr L, Expr R) {
auto IsAbs = [=] { return L.IsAbsolute() && R.IsAbsolute(); }; auto IsAbs = [=] { return L.IsAbsolute() && R.IsAbsolute(); };
auto GetOutSec = [=] { auto GetOutSec = [=] {
OutputSection *S = L.Section(); SectionBase *S = L.Section();
return S ? S : R.Section(); return S ? S : R.Section();
}; };

5
lld/ELF/LinkerScript.h
View File

@ -36,6 +36,7 @@ class InputSection;
class OutputSection; class OutputSection;
class OutputSectionFactory; class OutputSectionFactory;
class InputSectionBase; class InputSectionBase;
class SectionBase;
// This represents an expression in the linker script. // This represents an expression in the linker script.
// ScriptParser::readExpr reads an expression and returns an Expr. // ScriptParser::readExpr reads an expression and returns an Expr.
@ -47,13 +48,13 @@ struct Expr {
// If expression is section-relative the function below is used // If expression is section-relative the function below is used
// to get the output section pointer. // to get the output section pointer.
std::function<OutputSection *()> Section; std::function<SectionBase *()> Section;
uint64_t operator()(uint64_t Dot) const { return Val(Dot); } uint64_t operator()(uint64_t Dot) const { return Val(Dot); }
operator bool() const { return (bool)Val; } operator bool() const { return (bool)Val; }
Expr(std::function<uint64_t(uint64_t)> Val, std::function<bool()> IsAbsolute, Expr(std::function<uint64_t(uint64_t)> Val, std::function<bool()> IsAbsolute,
std::function<OutputSection *()> Section) std::function<SectionBase *()> Section)
: Val(Val), IsAbsolute(IsAbsolute), Section(Section) {} : Val(Val), IsAbsolute(IsAbsolute), Section(Section) {}
template <typename T> template <typename T>
Expr(T V) : Expr(V, [] { return true; }, [] { return nullptr; }) {} Expr(T V) : Expr(V, [] { return true; }, [] { return nullptr; }) {}