diff options
| author | Reid Kleckner <rnk@google.com> | 2020-06-11 13:00:54 -0700 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2020-06-11 14:46:16 -0700 |
| commit | 1c03389c29f32cce81a642365c484c71aba1a1cb (patch) | |
| tree | 5b6ec77d37a2c78e1a3dc8a89004be921079c3a6 /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
| parent | f44d2424f8d7735d7ab5ffd96f75300221afd099 (diff) | |
| download | llvm-1c03389c29f32cce81a642365c484c71aba1a1cb.zip llvm-1c03389c29f32cce81a642365c484c71aba1a1cb.tar.gz llvm-1c03389c29f32cce81a642365c484c71aba1a1cb.tar.bz2 | |
Re-land "Migrate the rest of COFFObjectFile to Error"
This reverts commit 101fbc01382edd89ea7b671104c68b30b2446cc0.
Remove leftover debugging attribute.
Update LLDB as well, which was missed before.
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 fbc0f01..d130e5c 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -1258,14 +1258,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 (std::error_code EC = ExportEntry.getSymbolName(Name)) - reportError(errorCodeToError(EC), Obj->getFileName()); + if (Error E = ExportEntry.getSymbolName(Name)) + reportError(std::move(E), Obj->getFileName()); if (Name.empty()) continue; uint32_t RVA; - if (std::error_code EC = ExportEntry.getExportRVA(RVA)) - reportError(errorCodeToError(EC), Obj->getFileName()); + if (Error E = ExportEntry.getExportRVA(RVA)) + reportError(std::move(E), Obj->getFileName()); uint64_t VA = COFFObj->getImageBase() + RVA; auto Sec = partition_point( |