<div dir="ltr">I didn't mean to make it public, but protected.<div class="gmail_extra"><br><div class="gmail_quote">On Wed, Mar 15, 2017 at 9:07 AM, George Rimar via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: grimar<br>
Date: Wed Mar 15 11:07:02 2017<br>
New Revision: 297850<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=297850&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=297850&view=rev</a><br>
Log:<br>
[ELF] - Linkerscript: make Dot public and remove getDot(). NFC.<br>
<br>
Suggested by Rui Ueyama,<br>
also groups member variables in a single place, while I am here.<br>
<br>
Modified:<br>
    lld/trunk/ELF/LinkerScript.cpp<br>
    lld/trunk/ELF/LinkerScript.h<br>
<br>
Modified: lld/trunk/ELF/LinkerScript.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=297850&r1=297849&r2=297850&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/lld/trunk/ELF/LinkerScri<wbr>pt.cpp?rev=297850&r1=297849&<wbr>r2=297850&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lld/trunk/ELF/LinkerScript.cpp (original)<br>
+++ lld/trunk/ELF/LinkerScript.cpp Wed Mar 15 11:07:02 2017<br>
@@ -1424,7 +1424,7 @@ Expr ScriptParser::readAssert() {<br>
   return [=] {<br>
     if (!E())<br>
       error(Msg);<br>
-    return ScriptBase->getDot();<br>
+    return ScriptBase->Dot;<br>
   };<br>
 }<br>
<br>
@@ -1754,7 +1754,7 @@ Expr ScriptParser::readPrimary() {<br>
       return [=] { return alignTo(E(), E2()); };<br>
     }<br>
     expect(")");<br>
-    return [=] { return alignTo(ScriptBase->getDot(), E()); };<br>
+    return [=] { return alignTo(ScriptBase->Dot, E()); };<br>
   }<br>
   if (Tok == "CONSTANT") {<br>
     StringRef Name = readParenLiteral();<br>
@@ -1778,13 +1778,13 @@ Expr ScriptParser::readPrimary() {<br>
     expect(",");<br>
     readExpr();<br>
     expect(")");<br>
-    return [=] { return alignTo(ScriptBase->getDot(), E()); };<br>
+    return [=] { return alignTo(ScriptBase->Dot, E()); };<br>
   }<br>
   if (Tok == "DATA_SEGMENT_END") {<br>
     expect("(");<br>
     expect(".");<br>
     expect(")");<br>
-    return []() { return ScriptBase->getDot(); };<br>
+    return []() { return ScriptBase->Dot; };<br>
   }<br>
   // GNU linkers implements more complicated logic to handle<br>
   // DATA_SEGMENT_RELRO_END. We instead ignore the arguments and just align to<br>
@@ -1795,7 +1795,7 @@ Expr ScriptParser::readPrimary() {<br>
     expect(",");<br>
     readExpr();<br>
     expect(")");<br>
-    return []() { return alignTo(ScriptBase->getDot(), Target->PageSize); };<br>
+    return []() { return alignTo(ScriptBase->Dot, Target->PageSize); };<br>
   }<br>
   if (Tok == "SIZEOF") {<br>
     StringRef Name = readParenLiteral();<br>
<br>
Modified: lld/trunk/ELF/LinkerScript.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.h?rev=297850&r1=297849&r2=297850&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/lld/trunk/ELF/LinkerScri<wbr>pt.h?rev=297850&r1=297849&r2=<wbr>297850&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lld/trunk/ELF/LinkerScript.h (original)<br>
+++ lld/trunk/ELF/LinkerScript.h Wed Mar 15 11:07:02 2017<br>
@@ -252,7 +252,6 @@ protected:<br>
   // "ScriptConfig" is a bit too long, so define a short name for it.<br>
   ScriptConfiguration &Opt = *ScriptConfig;<br>
<br>
-  uint64_t Dot;<br>
   uint64_t ThreadBssOffset = 0;<br>
<br>
   std::function<uint64_t()> LMAOffset;<br>
@@ -263,8 +262,10 @@ protected:<br>
   llvm::DenseSet<InputSectionBa<wbr>se *> AlreadyOutputIS;<br>
<br>
 public:<br>
+  uint64_t Dot;<br>
+  std::vector<OutputSection *> *OutputSections;<br>
+<br>
   bool hasPhdrsCommands() { return !Opt.PhdrsCommands.empty(); }<br>
-  uint64_t getDot() { return Dot; }<br>
   OutputSection *getOutputSection(const Twine &Loc, StringRef S);<br>
   uint64_t getOutputSectionSize(StringRef S);<br>
   void discard(ArrayRef<InputSectionB<wbr>ase *> V);<br>
@@ -274,7 +275,6 @@ public:<br>
   virtual bool isAbsolute(StringRef S) = 0;<br>
   virtual OutputSection *getSymbolSection(StringRef S) = 0;<br>
<br>
-  std::vector<OutputSection *> *OutputSections;<br>
   void addOrphanSections(OutputSectio<wbr>nFactory &Factory);<br>
   void removeEmptyCommands();<br>
   void adjustSectionsBeforeSorting();<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>