[lld] r315165 - Make ScriptParser::checkSection a non-member function.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Sat Oct  7 19:27:02 2017
New Revision: 315165

URL: http://llvm.org/viewvc/llvm-project?rev=315165&view=rev
Log:
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.

Modified:
    lld/trunk/ELF/ScriptParser.cpp

Modified: lld/trunk/ELF/ScriptParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/ScriptParser.cpp?rev=315165&r1=315164&r2=315165&view=diff
==============================================================================
--- lld/trunk/ELF/ScriptParser.cpp (original)
+++ lld/trunk/ELF/ScriptParser.cpp Sat Oct  7 19:27:02 2017
@@ -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();