svn commit: r328545 - head/contrib/llvm/tools/lld/ELF

[Ed Maste]

Author: emaste
Date: Mon Jan 29 13:51:13 2018
New Revision: 328545
URL: https://svnweb.freebsd.org/changeset/base/328545

Log:
  lld: Simplify. NFC.
  
  Obtained from:	LLVM r323440 by Rafael Espindola

Modified:
  head/contrib/llvm/tools/lld/ELF/LinkerScript.cpp
  head/contrib/llvm/tools/lld/ELF/LinkerScript.h

Modified: head/contrib/llvm/tools/lld/ELF/LinkerScript.cpp
==============================================================================
--- head/contrib/llvm/tools/lld/ELF/LinkerScript.cpp	Mon Jan 29 13:50:28 2018	(r328544)
+++ head/contrib/llvm/tools/lld/ELF/LinkerScript.cpp	Mon Jan 29 13:51:13 2018	(r328545)
@@ -656,22 +656,18 @@ void LinkerScript::assignOffsets(OutputSection *Sec) {
 
   switchTo(Sec);
 
-  if (Sec->LMAExpr) {
-    uint64_t D = Dot;
-    Ctx->LMAOffset = [=] { return Sec->LMAExpr().getValue() - D; };
-  }
+  if (Sec->LMAExpr)
+    Ctx->LMAOffset = Sec->LMAExpr().getValue() - Dot;
 
-  if (MemoryRegion *MR = Sec->LMARegion) {
-    uint64_t Offset = MR->Origin - Dot;
-    Ctx->LMAOffset = [=] { return Offset; };
-  }
+  if (MemoryRegion *MR = Sec->LMARegion)
+    Ctx->LMAOffset = MR->Origin - Dot;
 
   // If neither AT nor AT> is specified for an allocatable section, the linker
   // will set the LMA such that the difference between VMA and LMA for the
   // section is the same as the preceding output section in the same region
   // https://sourceware.org/binutils/docs-2.20/ld/Output-Section-LMA.html
   if (Ctx->LMAOffset)
-    Ctx->OutSec->LMAOffset = Ctx->LMAOffset();
+    Ctx->OutSec->LMAOffset = Ctx->LMAOffset;
 
   // The Size previously denoted how many InputSections had been added to this
   // section, and was used for sorting SHF_LINK_ORDER sections. Reset it to

Modified: head/contrib/llvm/tools/lld/ELF/LinkerScript.h
==============================================================================
--- head/contrib/llvm/tools/lld/ELF/LinkerScript.h	Mon Jan 29 13:50:28 2018	(r328544)
+++ head/contrib/llvm/tools/lld/ELF/LinkerScript.h	Mon Jan 29 13:51:13 2018	(r328545)
@@ -206,7 +206,7 @@ class LinkerScript final {
     uint64_t ThreadBssOffset = 0;
     OutputSection *OutSec = nullptr;
     MemoryRegion *MemRegion = nullptr;
-    std::function<uint64_t()> LMAOffset;
+    uint64_t LMAOffset = 0;
   };
 
   llvm::DenseMap<StringRef, OutputSection *> NameToOutputSection;