commit ad9d0ca878b5513c35ba1174b083dffe6e811463
author Rafael Espindola <rafael.espindola@gmail.com> Fri Dec 05 15:42:30 2014 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Fri Dec 05 15:42:30 2014 +0000
tree 2b9fd9e0cae003a8b57a90d0d760416ae6618029
parent 362d1202e231d86784e30c61ee7d3a20063c3426

Use an early return. NFC.

llvm-svn: 223470

llvm/lib/Linker/LinkModules.cpp

diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp
index 5b2d425..561b021 100644
--- a/llvm/lib/Linker/LinkModules.cpp
+++ b/llvm/lib/Linker/LinkModules.cpp
@@ -1028,30 +1028,30 @@
   else
     NewGV = linkGlobalAliasProto(cast<GlobalAlias>(SGV), DGV, LinkFromSrc);
 
-  if (NewGV) {
-    if (NewGV != DGV)
-      copyGVAttributes(NewGV, SGV);
+  if (!NewGV)
+    return false;
 
-    NewGV->setUnnamedAddr(HasUnnamedAddr);
-    NewGV->setVisibility(Visibility);
+  if (NewGV != DGV)
+    copyGVAttributes(NewGV, SGV);
 
-    if (auto *NewGO = dyn_cast<GlobalObject>(NewGV)) {
-      if (C)
-        NewGO->setComdat(C);
+  NewGV->setUnnamedAddr(HasUnnamedAddr);
+  NewGV->setVisibility(Visibility);
 
-      if (DGV && DGV->hasCommonLinkage() && SGV->hasCommonLinkage())
-        NewGO->setAlignment(std::max(DGV->getAlignment(), SGV->getAlignment()));
+  if (auto *NewGO = dyn_cast<GlobalObject>(NewGV)) {
+    if (C)
+      NewGO->setComdat(C);
+
+    if (DGV && DGV->hasCommonLinkage() && SGV->hasCommonLinkage())
+      NewGO->setAlignment(std::max(DGV->getAlignment(), SGV->getAlignment()));
+  }
+
+  // Make sure to remember this mapping.
+  if (NewGV != DGV) {
+    if (DGV) {
+      DGV->replaceAllUsesWith(ConstantExpr::getBitCast(NewGV, DGV->getType()));
+      DGV->eraseFromParent();
     }
-
-    // Make sure to remember this mapping.
-    if (NewGV != DGV) {
-      if (DGV) {
-        DGV->replaceAllUsesWith(
-            ConstantExpr::getBitCast(NewGV, DGV->getType()));
-        DGV->eraseFromParent();
-      }
-      ValueMap[SGV] = NewGV;
-    }
+    ValueMap[SGV] = NewGV;
   }
 
   return false;