[lld] r247165 - ELF2: Return early. NFC.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Wed Sep 9 10:40:51 PDT 2015


Author: ruiu
Date: Wed Sep  9 12:40:51 2015
New Revision: 247165

URL: http://llvm.org/viewvc/llvm-project?rev=247165&view=rev
Log:
ELF2: Return early. NFC.

Modified:
    lld/trunk/ELF/Symbols.cpp

Modified: lld/trunk/ELF/Symbols.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.cpp?rev=247165&r1=247164&r2=247165&view=diff
==============================================================================
--- lld/trunk/ELF/Symbols.cpp (original)
+++ lld/trunk/ELF/Symbols.cpp Wed Sep  9 12:40:51 2015
@@ -51,27 +51,26 @@ template <class ELFT> int SymbolBody::co
   if (L != R)
     return -1;
 
-  if (L.first && L.second) {
-    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;
-        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;
       return -1;
     }
-    if (Other->isCommon())
-      return 1;
-    return 0;
+    return -1;
   }
-  return 1;
+  if (Other->isCommon())
+    return 1;
+  return 0;
 }
 
 std::unique_ptr<InputFile> Lazy::getMember() {




More information about the llvm-commits mailing list