commit 6666f6ad73677338610f119d233ab7436ba285d8
author Rui Ueyama <ruiu@google.com> Wed Sep 09 17:55:09 2015 +0000
committer Rui Ueyama <ruiu@google.com> Wed Sep 09 17:55:09 2015 +0000
tree 6ae4db6c2ab9ca1dc171d196dde8ee358e5d567e
parent 7b560d40bddfb60f162a7541288aeba3776f79f8

ELF2: Reduce nesting by returning early. NFC.

llvm-svn: 247168

lld/ELF/Symbols.cpp

diff --git a/lld/ELF/Symbols.cpp b/lld/ELF/Symbols.cpp
index 04dec72..c3c90e0 100644
--- a/lld/ELF/Symbols.cpp
+++ b/lld/ELF/Symbols.cpp
@@ -50,22 +50,20 @@
 
   if (L != R)
     return -1;
-
   if (!L.first || !L.second)
     return 1;
   if (isCommon()) {
-    if (Other->isCommon()) {
-      auto *ThisC = cast<DefinedCommon<ELFT>>(this);
-      auto *OtherC = cast<DefinedCommon<ELFT>>(Other);
-      typename DefinedCommon<ELFT>::uintX_t MaxAlign =
-          std::max(ThisC->MaxAlignment, OtherC->MaxAlignment);
-      if (ThisC->Sym.st_size >= OtherC->Sym.st_size) {
-        ThisC->MaxAlignment = MaxAlign;
-        return 1;
-      }
-      OtherC->MaxAlignment = MaxAlign;
+    if (!Other->isCommon())
       return -1;
+    auto *ThisC = cast<DefinedCommon<ELFT>>(this);
+    auto *OtherC = cast<DefinedCommon<ELFT>>(Other);
+    typename DefinedCommon<ELFT>::uintX_t MaxAlign =
+        std::max(ThisC->MaxAlignment, OtherC->MaxAlignment);
+    if (ThisC->Sym.st_size >= OtherC->Sym.st_size) {
+      ThisC->MaxAlignment = MaxAlign;
+      return 1;
     }
+    OtherC->MaxAlignment = MaxAlign;
     return -1;
   }
   if (Other->isCommon())