diff options
author | Fangrui Song <maskray@google.com> | 2019-04-08 16:24:08 +0000 |
---|---|---|
committer | Fangrui Song <maskray@google.com> | 2019-04-08 16:24:08 +0000 |
commit | f67de6c9406fd8c4f2cb39eda9c686c59317abd3 (patch) | |
tree | 82cacc099b8839b59b21ef9a5d22f6d0475e0d71 /llvm/tools/llvm-objdump/COFFDump.cpp | |
parent | f6a60f1f8031c5e8b17cba6a010add6ae3ac0612 (diff) | |
download | bcm5719-llvm-f67de6c9406fd8c4f2cb39eda9c686c59317abd3.tar.gz bcm5719-llvm-f67de6c9406fd8c4f2cb39eda9c686c59317abd3.zip |
[llvm-objdump] Migrate relocation handling functions from error_code to Error
llvm-svn: 357920
Diffstat (limited to 'llvm/tools/llvm-objdump/COFFDump.cpp')
-rw-r--r-- | llvm/tools/llvm-objdump/COFFDump.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/llvm/tools/llvm-objdump/COFFDump.cpp b/llvm/tools/llvm-objdump/COFFDump.cpp index 2d129043c26..251c555b400 100644 --- a/llvm/tools/llvm-objdump/COFFDump.cpp +++ b/llvm/tools/llvm-objdump/COFFDump.cpp @@ -468,17 +468,16 @@ static bool getPDataSection(const COFFObjectFile *Obj, return false; } -std::error_code -llvm::getCOFFRelocationValueString(const COFFObjectFile *Obj, - const RelocationRef &Rel, - SmallVectorImpl<char> &Result) { +Error llvm::getCOFFRelocationValueString(const COFFObjectFile *Obj, + const RelocationRef &Rel, + SmallVectorImpl<char> &Result) { symbol_iterator SymI = Rel.getSymbol(); Expected<StringRef> SymNameOrErr = SymI->getName(); if (!SymNameOrErr) - return errorToErrorCode(SymNameOrErr.takeError()); + return SymNameOrErr.takeError(); StringRef SymName = *SymNameOrErr; Result.append(SymName.begin(), SymName.end()); - return std::error_code(); + return Error::success(); } static void printWin64EHUnwindInfo(const Win64EH::UnwindInfo *UI) { |