summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-12-05 00:30:47 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-12-05 00:30:47 +0000
commit3124ed4b23210dffd4d8102234e673b14270625d (patch)
tree081744e00791d6e22b7c5f2d5548e23d2ac02507 /llvm/lib
parentde0d41fb4dd3dc17cc86f22036a7309eddab268f (diff)
downloadbcm5719-llvm-3124ed4b23210dffd4d8102234e673b14270625d.tar.gz
bcm5719-llvm-3124ed4b23210dffd4d8102234e673b14270625d.zip
linkGlobalVariableProto never returns null. Simplify the caller. NFC.
llvm-svn: 223424
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Linker/LinkModules.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp
index 738791d7e56..5b2d425c805 100644
--- a/llvm/lib/Linker/LinkModules.cpp
+++ b/llvm/lib/Linker/LinkModules.cpp
@@ -1021,15 +1021,12 @@ bool ModuleLinker::linkGlobalValueProto(GlobalValue *SGV) {
return false;
GlobalValue *NewGV;
- if (auto *SGVar = dyn_cast<GlobalVariable>(SGV)) {
+ if (auto *SGVar = dyn_cast<GlobalVariable>(SGV))
NewGV = linkGlobalVariableProto(SGVar, DGV, LinkFromSrc);
- if (!NewGV)
- return true;
- } else if (auto *SF = dyn_cast<Function>(SGV)) {
+ else if (auto *SF = dyn_cast<Function>(SGV))
NewGV = linkFunctionProto(SF, DGV, LinkFromSrc);
- } else {
+ else
NewGV = linkGlobalAliasProto(cast<GlobalAlias>(SGV), DGV, LinkFromSrc);
- }
if (NewGV) {
if (NewGV != DGV)
OpenPOWER on IntegriCloud