[lld] r278931 - [ELF] - Linkerscript: make readAt() signature to be consistent with others read*(). NFC.

George Rimar via llvm-commits llvm-commits at lists.llvm.org
Wed Aug 17 07:48:18 PDT 2016


Author: grimar
Date: Wed Aug 17 09:48:17 2016
New Revision: 278931

URL: http://llvm.org/viewvc/llvm-project?rev=278931&view=rev
Log:
[ELF] - Linkerscript: make readAt() signature to be consistent with others read*(). NFC.

Modified:
    lld/trunk/ELF/LinkerScript.cpp

Modified: lld/trunk/ELF/LinkerScript.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=278931&r1=278930&r2=278931&view=diff
==============================================================================
--- lld/trunk/ELF/LinkerScript.cpp (original)
+++ lld/trunk/ELF/LinkerScript.cpp Wed Aug 17 09:48:17 2016
@@ -621,7 +621,7 @@ private:
   SortKind readSortKind();
   SymbolAssignment *readProvideHidden(bool Provide, bool Hidden);
   SymbolAssignment *readProvideOrAssignment(StringRef Tok);
-  void readAt(OutputSectionCommand *Cmd);
+  Expr readAt();
   Expr readAlign();
   void readSort();
   Expr readAssert();
@@ -927,10 +927,11 @@ Expr ScriptParser::readAssert() {
   };
 }
 
-void ScriptParser::readAt(OutputSectionCommand *Cmd) {
+Expr ScriptParser::readAt() {
   expect("(");
-  Cmd->LmaExpr = readExpr();
+  Expr E = readExpr();
   expect(")");
+  return E;
 }
 
 OutputSectionCommand *
@@ -945,7 +946,7 @@ ScriptParser::readOutputSectionDescripti
   expect(":");
 
   if (skip("AT"))
-    readAt(Cmd);
+    Cmd->LmaExpr = readAt();
 
   if (skip("ALIGN"))
     Cmd->AlignExpr = readAlign();




More information about the llvm-commits mailing list