diff options
| author | Nico Weber <thakis@chromium.org> | 2020-06-05 21:20:11 -0400 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2020-06-05 21:20:11 -0400 |
| commit | 101fbc01382edd89ea7b671104c68b30b2446cc0 (patch) | |
| tree | 7e4e8488e1dd39d0d78ba7b47019794253ee6c19 /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
| parent | d81b76cfe69b8a76481608d613138f77a0c9ac1d (diff) | |
| download | llvm-101fbc01382edd89ea7b671104c68b30b2446cc0.zip llvm-101fbc01382edd89ea7b671104c68b30b2446cc0.tar.gz llvm-101fbc01382edd89ea7b671104c68b30b2446cc0.tar.bz2 | |
Revert "Migrate the rest of COFFObjectFile to Error"
This reverts commit b5289656b865d2a73cf90819e20a96fb8414ab0b.
__attribute__((optnone)) doesn't build with msvc, see
http://lab.llvm.org:8011/builders/clang-x64-windows-msvc/builds/16326
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 3486a13..70ab0a1 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -1256,14 +1256,14 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj, if (const auto *COFFObj = dyn_cast<COFFObjectFile>(Obj)) { for (const auto &ExportEntry : COFFObj->export_directories()) { StringRef Name; - if (Error E = ExportEntry.getSymbolName(Name)) - reportError(std::move(E), Obj->getFileName()); + if (std::error_code EC = ExportEntry.getSymbolName(Name)) + reportError(errorCodeToError(EC), Obj->getFileName()); if (Name.empty()) continue; uint32_t RVA; - if (Error E = ExportEntry.getExportRVA(RVA)) - reportError(std::move(E), Obj->getFileName()); + if (std::error_code EC = ExportEntry.getExportRVA(RVA)) + reportError(errorCodeToError(EC), Obj->getFileName()); uint64_t VA = COFFObj->getImageBase() + RVA; auto Sec = partition_point( |