From 4e8cf85b74176e8c2e2c6ebbf4fa952d0d9791da Mon Sep 17 00:00:00 2001 From: George Rimar Date: Thu, 14 Apr 2016 13:00:03 +0000 Subject: [PATCH] Combine code branch into single line. NFC. llvm-svn: 266298 --- lld/ELF/Writer.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index 45add5b..cc1d015 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -1051,11 +1051,8 @@ OutputSectionFactory::createKey(InputSectionBase *C, // This makes each output section simple and keeps a single level mapping from // input to output. uintX_t Alignment = 0; - if (isa>(C)) { - Alignment = H->sh_addralign; - if (H->sh_entsize > Alignment) - Alignment = H->sh_entsize; - } + if (isa>(C)) + Alignment = std::max(H->sh_addralign, H->sh_entsize); // GNU as can give .eh_frame secion type SHT_PROGBITS or SHT_X86_64_UNWIND // depending on the construct. We want to canonicalize it so that -- 2.7.4