diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2017-10-11 17:23:15 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2017-10-11 17:23:15 +0000 |
commit | 748949257ac024a7a1f6d5d0f36d7196b99c7417 (patch) | |
tree | b27bebcc9575c87b59d150a998eabdf154e65c6f /llvm/tools/llvm-readobj/COFFDumper.cpp | |
parent | 9590658fb88d40b88ad5bb34c66c946513579384 (diff) | |
download | bcm5719-llvm-748949257ac024a7a1f6d5d0f36d7196b99c7417.tar.gz bcm5719-llvm-748949257ac024a7a1f6d5d0f36d7196b99c7417.zip |
Convert a few ErrorOr to Expected.
llvm-svn: 315477
Diffstat (limited to 'llvm/tools/llvm-readobj/COFFDumper.cpp')
-rw-r--r-- | llvm/tools/llvm-readobj/COFFDumper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/tools/llvm-readobj/COFFDumper.cpp b/llvm/tools/llvm-readobj/COFFDumper.cpp index 8f668b9953a..1ce00610edd 100644 --- a/llvm/tools/llvm-readobj/COFFDumper.cpp +++ b/llvm/tools/llvm-readobj/COFFDumper.cpp @@ -1423,9 +1423,9 @@ void COFFDumper::printSymbol(const SymbolRef &Sym) { const coff_aux_weak_external *Aux; error(getSymbolAuxData(Obj, Symbol, I, Aux)); - ErrorOr<COFFSymbolRef> Linked = Obj->getSymbol(Aux->TagIndex); + Expected<COFFSymbolRef> Linked = Obj->getSymbol(Aux->TagIndex); StringRef LinkedName; - std::error_code EC = Linked.getError(); + std::error_code EC = errorToErrorCode(Linked.takeError()); if (EC || (EC = Obj->getSymbolName(*Linked, LinkedName))) { LinkedName = ""; error(EC); @@ -1481,10 +1481,10 @@ void COFFDumper::printSymbol(const SymbolRef &Sym) { const coff_aux_clr_token *Aux; error(getSymbolAuxData(Obj, Symbol, I, Aux)); - ErrorOr<COFFSymbolRef> ReferredSym = + Expected<COFFSymbolRef> ReferredSym = Obj->getSymbol(Aux->SymbolTableIndex); StringRef ReferredName; - std::error_code EC = ReferredSym.getError(); + std::error_code EC = errorToErrorCode(ReferredSym.takeError()); if (EC || (EC = Obj->getSymbolName(*ReferredSym, ReferredName))) { ReferredName = ""; error(EC); |