From 71c85df86034ea0fcb882f8b38bd67e89298e14c Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Mon, 8 Feb 2016 22:58:26 +0000 Subject: [PATCH] [llvm-nm] Yet another attempt of simplifying code. llvm-svn: 260166 --- llvm/tools/llvm-nm/llvm-nm.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index dbc34b8..b01cab4 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -791,26 +791,20 @@ static char getSymbolNMTypeChar(MachOObjectFile &Obj, basic_symbol_iterator I) { } static char getSymbolNMTypeChar(const GlobalValue &GV) { - if (GV.getValueType()->isFunctionTy()) - return 't'; // FIXME: should we print 'b'? At the IR level we cannot be sure if this // will be in bss or not, but we could approximate. - return 'd'; + return (GV.getValueType()->isFunctionTy()) ? 't' : 'd'; } static char getSymbolNMTypeChar(IRObjectFile &Obj, basic_symbol_iterator I) { const GlobalValue *GV = Obj.getSymbolGV(I->getRawDataRefImpl()); - if (!GV) - return 't'; - return getSymbolNMTypeChar(*GV); + return (!GV) ? 't' : getSymbolNMTypeChar(*GV); } static bool isObject(SymbolicFile &Obj, basic_symbol_iterator I) { - auto *ELF = dyn_cast(&Obj); - if (!ELF) - return false; - - return elf_symbol_iterator(I)->getELFType() == ELF::STT_OBJECT; + return (!dyn_cast(&Obj)) + ? false + : elf_symbol_iterator(I)->getELFType() == ELF::STT_OBJECT; } static char getNMTypeChar(SymbolicFile &Obj, basic_symbol_iterator I) { -- 2.7.4