<div dir="ltr">It is probably still useful to keep the constant named, but just make it a local constant.</div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Jun 6, 2015 at 4:19 PM, Rui Ueyama <span dir="ltr"><<a href="mailto:ruiu@google.com" target="_blank">ruiu@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ruiu<br>
Date: Sat Jun  6 18:19:36 2015<br>
New Revision: 239235<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D239235-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=zgJCY3rLfr1GNW94qK6Nv393laaJYEeBKh_h6Kxstl4&s=6lWUmHTT0u-5sNziHqIJLEYptMYqE2XIT4Xgt6vvcFQ&e=" target="_blank">http://llvm.org/viewvc/llvm-project?rev=239235&view=rev</a><br>
Log:<br>
COFF: Inline a constant that is used only once.<br>
<br>
Modified:<br>
    lld/trunk/COFF/Writer.cpp<br>
<br>
Modified: lld/trunk/COFF/Writer.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_lld_trunk_COFF_Writer.cpp-3Frev-3D239235-26r1-3D239234-26r2-3D239235-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=zgJCY3rLfr1GNW94qK6Nv393laaJYEeBKh_h6Kxstl4&s=klb-Wk1pdBwaxxnf44S7h9_K_rsPS9_MDfe16Uuf9Xs&e=" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Writer.cpp?rev=239235&r1=239234&r2=239235&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/COFF/Writer.cpp (original)<br>
+++ lld/trunk/COFF/Writer.cpp Sat Jun  6 18:19:36 2015<br>
@@ -33,9 +33,6 @@ static const int FileAlignment = 512;<br>
 static const int SectionAlignment = 4096;<br>
 static const int DOSStubSize = 64;<br>
 static const int NumberfOfDataDirectory = 16;<br>
-static const int HeaderSize =<br>
-    DOSStubSize + sizeof(PEMagic) + sizeof(coff_file_header) +<br>
-    sizeof(pe32plus_header) + sizeof(data_directory) * NumberfOfDataDirectory;<br>
<br>
 namespace lld {<br>
 namespace coff {<br>
@@ -166,7 +163,10 @@ void Writer::removeEmptySections() {<br>
 // file offsets.<br>
 void Writer::assignAddresses() {<br>
   SizeOfHeaders = RoundUpToAlignment(<br>
-      HeaderSize + sizeof(coff_section) * OutputSections.size(), PageSize);<br>
+      DOSStubSize + sizeof(PEMagic) + sizeof(coff_file_header) +<br>
+      sizeof(pe32plus_header) +<br>
+      sizeof(data_directory) * NumberfOfDataDirectory +<br>
+      sizeof(coff_section) * OutputSections.size(), PageSize);<br>
   uint64_t RVA = 0x1000; // The first page is kept unmapped.<br>
   uint64_t FileOff = SizeOfHeaders;<br>
   for (OutputSection *Sec : OutputSections) {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>