diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-07-03 18:19:00 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-07-03 18:19:00 +0000 |
| commit | ed067c45d4b668db740fbb1728200fc51f4b9b51 (patch) | |
| tree | cc50ae3d78954ad1e634cbd4278eec6095a50bdb /llvm/tools/llvm-nm/llvm-nm.cpp | |
| parent | e2df87f24b0af7fa80789e8da15c9cef9e6996f7 (diff) | |
| download | bcm5719-llvm-ed067c45d4b668db740fbb1728200fc51f4b9b51.tar.gz bcm5719-llvm-ed067c45d4b668db740fbb1728200fc51f4b9b51.zip | |
Return ErrorOr from getSymbolAddress.
It can fail trying to get the section on ELF and COFF. This makes sure the
error is handled.
llvm-svn: 241366
Diffstat (limited to 'llvm/tools/llvm-nm/llvm-nm.cpp')
| -rw-r--r-- | llvm/tools/llvm-nm/llvm-nm.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index c88f3733456..cf674610995 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -901,8 +901,10 @@ static void dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName, S.Size = ELFSymbolRef(Sym).getSize(); } if (PrintAddress && isa<ObjectFile>(Obj)) { - if (error(SymbolRef(Sym).getAddress(S.Address))) + ErrorOr<uint64_t> AddressOrErr = SymbolRef(Sym).getAddress(); + if (error(AddressOrErr.getError())) break; + S.Address = *AddressOrErr; } S.TypeChar = getNMTypeChar(Obj, Sym); if (error(Sym.printName(OS))) |
