commit 3de0a3308b18274eb6490b14e46a4c25e579866e
author Rui Ueyama <ruiu@google.com> Fri Jul 29 03:31:09 2016 +0000
committer Rui Ueyama <ruiu@google.com> Fri Jul 29 03:31:09 2016 +0000
tree c007df279d13b1a0f0a7965e54f6bc477a07187e
parent a926b3e71b6aad25a53713cf85a0ee3c8583d2af

Rename DoLayout -> HasContents. NFC.

llvm-svn: 277102

lld/ELF/LinkerScript.cpp

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 96808d7..04194fc 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -646,7 +646,7 @@
 }
 
 void ScriptParser::readSections() {
-  Opt.DoLayout = true;
+  Opt.HasContents = true;
   expect("{");
   while (!Error && !skip("}")) {
     StringRef Tok = next();

lld/ELF/LinkerScript.h

diff --git a/lld/ELF/LinkerScript.h b/lld/ELF/LinkerScript.h
index 5134888..f5b87f3 100644
--- a/lld/ELF/LinkerScript.h
+++ b/lld/ELF/LinkerScript.h
@@ -105,7 +105,7 @@
   // Used to assign sections to headers.
   std::vector<PhdrsCommand> PhdrsCommands;
 
-  bool DoLayout = false;
+  bool HasContents = false;
 
   llvm::BumpPtrAllocator Alloc;
 

lld/ELF/Writer.cpp

diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 6816946..94e77d5 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -224,10 +224,9 @@
   CommonInputSection<ELFT> Common;
   CommonInputSection<ELFT>::X = &Common;
 
-  OutputSections =
-      ScriptConfig->DoLayout
-          ? Script<ELFT>::X->createSections(Factory)
-          : createSections();
+  OutputSections = ScriptConfig->HasContents
+                       ? Script<ELFT>::X->createSections(Factory)
+                       : createSections();
   finalizeSections();
   if (HasError)
     return;
@@ -239,7 +238,7 @@
                 ? Script<ELFT>::X->createPhdrs(OutputSections)
                 : createPhdrs();
     fixHeaders();
-    if (ScriptConfig->DoLayout) {
+    if (ScriptConfig->HasContents) {
       Script<ELFT>::X->assignAddresses(OutputSections);
     } else {
       fixSectionAlignments();
@@ -1027,7 +1026,7 @@
 // sections. These are special, we do not include them into output sections
 // list, but have them to simplify the code.
 template <class ELFT> void Writer<ELFT>::fixHeaders() {
-  uintX_t BaseVA = ScriptConfig->DoLayout ? 0 : Config->ImageBase;
+  uintX_t BaseVA = ScriptConfig->HasContents ? 0 : Config->ImageBase;
   Out<ELFT>::ElfHeader->setVA(BaseVA);
   uintX_t Off = Out<ELFT>::ElfHeader->getSize();
   Out<ELFT>::ProgramHeaders->setVA(Off + BaseVA);