diff options
Diffstat (limited to 'llvm/tools/llvm-nm/llvm-nm.cpp')
| -rw-r--r-- | llvm/tools/llvm-nm/llvm-nm.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index dad04b9594d..f86e758eb08 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -724,9 +724,11 @@ static char getSymbolNMTypeChar(ELFObjectFileBase &Obj, } if (SymI->getELFType() == ELF::STT_SECTION) { - ErrorOr<StringRef> Name = SymI->getName(); - if (error(Name.getError())) + Expected<StringRef> Name = SymI->getName(); + if (!Name) { + consumeError(Name.takeError()); return '?'; + } return StringSwitch<char>(*Name) .StartsWith(".debug", 'N') .StartsWith(".note", 'n') @@ -741,9 +743,11 @@ static char getSymbolNMTypeChar(COFFObjectFile &Obj, symbol_iterator I) { // OK, this is COFF. symbol_iterator SymI(I); - ErrorOr<StringRef> Name = SymI->getName(); - if (error(Name.getError())) + Expected<StringRef> Name = SymI->getName(); + if (!Name) { + consumeError(Name.takeError()); return '?'; + } char Ret = StringSwitch<char>(*Name) .StartsWith(".debug", 'N') |
