replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove else if a last block ends with return. 

llvm-svn: 231330
This commit is contained in:
Rui Ueyama 2015-03-05 01:02:20 +00:00
parent 4dfb0f0079
commit 97d8bec7ea
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lld/lib/ReaderWriter/ELF/Atoms.h
View File

@ -98,8 +98,7 @@ public:
return scopeLinkageUnit; return scopeLinkageUnit;
if (_symbol->getBinding() == llvm::ELF::STB_LOCAL) if (_symbol->getBinding() == llvm::ELF::STB_LOCAL)
return scopeTranslationUnit; return scopeTranslationUnit;
else return scopeGlobal;
return scopeGlobal;
} }
StringRef name() const override { return _name; } StringRef name() const override { return _name; }
@ -131,8 +130,7 @@ public:
CanBeNull canBeNull() const override { CanBeNull canBeNull() const override {
if (_symbol->getBinding() == llvm::ELF::STB_WEAK) if (_symbol->getBinding() == llvm::ELF::STB_WEAK)
return CanBeNull::canBeNullAtBuildtime; return CanBeNull::canBeNullAtBuildtime;
else return CanBeNull::canBeNullNever;
return CanBeNull::canBeNullNever;
} }
private: private:
@ -186,10 +184,9 @@ public:
return scopeGlobal; return scopeGlobal;
if (_symbol->getVisibility() == llvm::ELF::STV_HIDDEN) if (_symbol->getVisibility() == llvm::ELF::STV_HIDDEN)
return scopeLinkageUnit; return scopeLinkageUnit;
else if (_symbol->getBinding() != llvm::ELF::STB_LOCAL) if (_symbol->getBinding() != llvm::ELF::STB_LOCAL)
return scopeGlobal; return scopeGlobal;
else return scopeTranslationUnit;
return scopeTranslationUnit;
} }
// FIXME: Need to revisit this in future. // FIXME: Need to revisit this in future.
@ -303,7 +300,8 @@ public:
if ((_symbol->getType() == llvm::ELF::STT_COMMON) || if ((_symbol->getType() == llvm::ELF::STT_COMMON) ||
_symbol->st_shndx == llvm::ELF::SHN_COMMON) { _symbol->st_shndx == llvm::ELF::SHN_COMMON) {
return Alignment(llvm::Log2_64(symValue)); return Alignment(llvm::Log2_64(symValue));
} else if (_section->sh_addralign == 0) { }
if (_section->sh_addralign == 0) {
// sh_addralign of 0 means no alignment // sh_addralign of 0 means no alignment
return Alignment(0, symValue); return Alignment(0, symValue);
} }
@ -560,10 +558,9 @@ public:
Scope scope() const override { Scope scope() const override {
if (_symbol->getVisibility() == llvm::ELF::STV_HIDDEN) if (_symbol->getVisibility() == llvm::ELF::STV_HIDDEN)
return scopeLinkageUnit; return scopeLinkageUnit;
else if (_symbol->getBinding() != llvm::ELF::STB_LOCAL) if (_symbol->getBinding() != llvm::ELF::STB_LOCAL)
return scopeGlobal; return scopeGlobal;
else return scopeTranslationUnit;
return scopeTranslationUnit;
} }
Interposable interposable() const override { return interposeNo; } Interposable interposable() const override { return interposeNo; }
@ -633,10 +630,9 @@ public:
virtual Scope scope() const { virtual Scope scope() const {
if (_symbol->getVisibility() == llvm::ELF::STV_HIDDEN) if (_symbol->getVisibility() == llvm::ELF::STV_HIDDEN)
return scopeLinkageUnit; return scopeLinkageUnit;
else if (_symbol->getBinding() != llvm::ELF::STB_LOCAL) if (_symbol->getBinding() != llvm::ELF::STB_LOCAL)
return scopeGlobal; return scopeGlobal;
else return scopeTranslationUnit;
return scopeTranslationUnit;
} }
StringRef loadName() const override { return _loadName; } StringRef loadName() const override { return _loadName; }