diff options
author | Davide Italiano <davide@freebsd.org> | 2016-02-05 21:10:48 +0000 |
---|---|---|
committer | Davide Italiano <davide@freebsd.org> | 2016-02-05 21:10:48 +0000 |
commit | a090a00e45bb35ce46e9c665b7f9b84b1b070bc1 (patch) | |
tree | ef5ffda23957d23f48ee04308f40aea82336936e /llvm/tools/llvm-nm/llvm-nm.cpp | |
parent | 0ce2f227e83bb46da47921165792eaa26002a9e9 (diff) | |
download | bcm5719-llvm-a090a00e45bb35ce46e9c665b7f9b84b1b070bc1.tar.gz bcm5719-llvm-a090a00e45bb35ce46e9c665b7f9b84b1b070bc1.zip |
[llvm-nm] Simplify code logic. NFCI.
llvm-svn: 259917
Diffstat (limited to 'llvm/tools/llvm-nm/llvm-nm.cpp')
-rw-r--r-- | llvm/tools/llvm-nm/llvm-nm.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index 01f82cfff8a..0c2c3391efd 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -817,9 +817,7 @@ static char getNMTypeChar(SymbolicFile &Obj, basic_symbol_iterator I) { uint32_t Symflags = I->getFlags(); if ((Symflags & object::SymbolRef::SF_Weak) && !isa<MachOObjectFile>(Obj)) { char Ret = isObject(Obj, I) ? 'v' : 'w'; - if (!(Symflags & object::SymbolRef::SF_Undefined)) - Ret = toupper(Ret); - return Ret; + return (!(Symflags & object::SymbolRef::SF_Undefined)) ? toupper(Ret) : Ret; } if (Symflags & object::SymbolRef::SF_Undefined) @@ -834,10 +832,8 @@ static char getNMTypeChar(SymbolicFile &Obj, basic_symbol_iterator I) { else if (IRObjectFile *IR = dyn_cast<IRObjectFile>(&Obj)) { Ret = getSymbolNMTypeChar(*IR, I); Triple Host(sys::getDefaultTargetTriple()); - if (Ret == 'd' && Host.isOSDarwin()) { - if(Symflags & SymbolRef::SF_Const) - Ret = 's'; - } + if (Ret == 'd' && Host.isOSDarwin() && Symflags & SymbolRef::SF_Const) + Ret = 's'; } else if (COFFObjectFile *COFF = dyn_cast<COFFObjectFile>(&Obj)) Ret = getSymbolNMTypeChar(*COFF, I); |