diff options
| author | Davide Italiano <davide@freebsd.org> | 2016-02-11 02:56:02 +0000 |
|---|---|---|
| committer | Davide Italiano <davide@freebsd.org> | 2016-02-11 02:56:02 +0000 |
| commit | ba284b60b87f62fbb52f29541141cf2afb9502bc (patch) | |
| tree | ec14652dc8987d1e16493cf4d4766f2f904b23b7 /llvm/tools | |
| parent | 031bbd062ba165b22902f0d996605c5b4abcb92e (diff) | |
| download | bcm5719-llvm-ba284b60b87f62fbb52f29541141cf2afb9502bc.tar.gz bcm5719-llvm-ba284b60b87f62fbb52f29541141cf2afb9502bc.zip | |
[llvm-nm] Simplify code logic. Rewrite a single function an inline.
llvm-svn: 260482
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/llvm-nm/llvm-nm.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index e37cb1fa10e..e288e5a144d 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -774,18 +774,10 @@ static char getSymbolNMTypeChar(COFFObjectFile &Obj, symbol_iterator I) { return '?'; } -static uint8_t getNType(MachOObjectFile &Obj, DataRefImpl Symb) { - if (Obj.is64Bit()) { - MachO::nlist_64 STE = Obj.getSymbol64TableEntry(Symb); - return STE.n_type; - } - MachO::nlist STE = Obj.getSymbolTableEntry(Symb); - return STE.n_type; -} - static char getSymbolNMTypeChar(MachOObjectFile &Obj, basic_symbol_iterator I) { DataRefImpl Symb = I->getRawDataRefImpl(); - uint8_t NType = getNType(Obj, Symb); + uint8_t NType = Obj.is64Bit() ? Obj.getSymbol64TableEntry(Symb).n_type + : Obj.getSymbolTableEntry(Symb).n_type; if (NType & MachO::N_STAB) return '-'; @@ -898,14 +890,10 @@ static unsigned getNsectInMachO(MachOObjectFile &Obj, BasicSymbolRef Sym) { DataRefImpl Symb = Sym.getRawDataRefImpl(); if (Obj.is64Bit()) { MachO::nlist_64 STE = Obj.getSymbol64TableEntry(Symb); - if ((STE.n_type & MachO::N_TYPE) == MachO::N_SECT) - return STE.n_sect; - return 0; + return (STE.n_type & MachO::N_TYPE) == MachO::N_SECT ? STE.n_sect : 0; } MachO::nlist STE = Obj.getSymbolTableEntry(Symb); - if ((STE.n_type & MachO::N_TYPE) == MachO::N_SECT) - return STE.n_sect; - return 0; + return (STE.n_type & MachO::N_TYPE) == MachO::N_SECT ? STE.n_sect : 0; } static void dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName, |
