summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Linker/LinkModules.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-08-11 16:55:42 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-08-11 16:55:42 +0000
commit2ef3f299d5debeba26aac0c50c1727c7a7ac4038 (patch)
tree2f1580137f1650d1bd65aca5ec92f58b5be3e340 /llvm/lib/Linker/LinkModules.cpp
parent52c6cd1bbb9aed74a2fda6628ae628d3cc1bacd9 (diff)
downloadbcm5719-llvm-2ef3f299d5debeba26aac0c50c1727c7a7ac4038.tar.gz
bcm5719-llvm-2ef3f299d5debeba26aac0c50c1727c7a7ac4038.zip
Use an early return. NFC.
llvm-svn: 215363
Diffstat (limited to 'llvm/lib/Linker/LinkModules.cpp')
-rw-r--r--llvm/lib/Linker/LinkModules.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp
index 5bb2862cca0..1f4c3c13238 100644
--- a/llvm/lib/Linker/LinkModules.cpp
+++ b/llvm/lib/Linker/LinkModules.cpp
@@ -647,14 +647,15 @@ bool ModuleLinker::getComdatResult(const Comdat *SrcC,
StringRef ComdatName = SrcC->getName();
Module::ComdatSymTabType &ComdatSymTab = DstM->getComdatSymbolTable();
Module::ComdatSymTabType::iterator DstCI = ComdatSymTab.find(ComdatName);
- if (DstCI != ComdatSymTab.end()) {
- const Comdat *DstC = &DstCI->second;
- Comdat::SelectionKind SSK = SrcC->getSelectionKind();
- Comdat::SelectionKind DSK = DstC->getSelectionKind();
- if (computeResultingSelectionKind(ComdatName, SSK, DSK, Result, LinkFromSrc))
- return true;
- }
- return false;
+
+ if (DstCI == ComdatSymTab.end())
+ return false;
+
+ const Comdat *DstC = &DstCI->second;
+ Comdat::SelectionKind SSK = SrcC->getSelectionKind();
+ Comdat::SelectionKind DSK = DstC->getSelectionKind();
+ return computeResultingSelectionKind(ComdatName, SSK, DSK, Result,
+ LinkFromSrc);
}
/// getLinkageResult - This analyzes the two global values and determines what
OpenPOWER on IntegriCloud