commit 8befefb2eae8afa683c761189a12d0e3a23367ab
author Rui Ueyama <ruiu@google.com> Sat Oct 07 00:58:34 2017 +0000
committer Rui Ueyama <ruiu@google.com> Sat Oct 07 00:58:34 2017 +0000
tree 9291150849c5f0dfafd5363add3b14cecb858c43
parent c8e0f79b904548a59a7e0b378671e2d70f624055

Remove OutputSection::updateAlignment.

I feel it is easier to understand without this function.

llvm-svn: 315140

lld/ELF/LinkerScript.cpp

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 577b32f..a8e72f5 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -688,7 +688,8 @@
       Sec->MemRegion = findMemoryRegion(Sec);
       // Handle align (e.g. ".foo : ALIGN(16) { ... }").
       if (Sec->AlignExpr)
-        Sec->updateAlignment(Sec->AlignExpr().getValue());
+        Sec->Alignment =
+            std::max<uint32_t>(Sec->Alignment, Sec->AlignExpr().getValue());
     }
   }