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

Make ScriptParser::checkSection a non-member function. 

This patch also make its return type to `void` because
it always returns a given value as-is.

llvm-svn: 315165
This commit is contained in:
Rui Ueyama 2017-10-08 02:27:02 +00:00
parent 9b18f50f79
commit 617e2f98a0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lld/ELF/ScriptParser.cpp
View File

@ -56,7 +56,6 @@ public:
private:
void addFile(StringRef Path);
OutputSection *checkSection(OutputSection *Cmd, StringRef Loccation);
void readAsNeeded();
void readEntry();
@ -908,11 +907,9 @@ StringRef ScriptParser::readParenLiteral() {
return Tok;
}
OutputSection *ScriptParser::checkSection(OutputSection *Cmd,
StringRef Location) {
static void checkIfExists(OutputSection *Cmd, StringRef Location) {
if (Cmd->Location.empty() && Script->ErrorOnMissingSection)
error(Location + ": undefined section " + Cmd->Name);
return Cmd;
}
Expr ScriptParser::readPrimary() {
@ -949,7 +946,8 @@ Expr ScriptParser::readPrimary() {
StringRef Name = readParenLiteral();
OutputSection *Cmd = Script->getOrCreateOutputSection(Name);
return [=]() -> ExprValue {
return {checkSection(Cmd, Location), 0, Location};
checkIfExists(Cmd, Location);
return {Cmd, 0, Location};
};
}
if (Tok == "ALIGN") {
@ -971,7 +969,10 @@ Expr ScriptParser::readPrimary() {
if (Tok == "ALIGNOF") {
StringRef Name = readParenLiteral();
OutputSection *Cmd = Script->getOrCreateOutputSection(Name);
return [=] { return checkSection(Cmd, Location)->Alignment; };
return [=] {
checkIfExists(Cmd, Location);
return Cmd->Alignment;
};
}
if (Tok == "ASSERT")
return readAssertExpr();
@ -1018,7 +1019,10 @@ Expr ScriptParser::readPrimary() {
if (Tok == "LOADADDR") {
StringRef Name = readParenLiteral();
OutputSection *Cmd = Script->getOrCreateOutputSection(Name);
return [=] { return checkSection(Cmd, Location)->getLMA(); };
return [=] {
checkIfExists(Cmd, Location);
return Cmd->getLMA();
};
}
if (Tok == "ORIGIN") {
StringRef Name = readParenLiteral();