summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-objdump/MachODump.cpp
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2019-04-08 16:24:08 +0000
committerFangrui Song <maskray@google.com>2019-04-08 16:24:08 +0000
commitf67de6c9406fd8c4f2cb39eda9c686c59317abd3 (patch)
tree82cacc099b8839b59b21ef9a5d22f6d0475e0d71 /llvm/tools/llvm-objdump/MachODump.cpp
parentf6a60f1f8031c5e8b17cba6a010add6ae3ac0612 (diff)
downloadbcm5719-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/MachODump.cpp')
-rw-r--r--llvm/tools/llvm-objdump/MachODump.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index 974f55a7208..54c954340f8 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/tools/llvm-objdump/MachODump.cpp
@@ -412,10 +412,9 @@ static void printRelocationTargetName(const MachOObjectFile *O,
Fmt << S;
}
-std::error_code
-llvm::getMachORelocationValueString(const MachOObjectFile *Obj,
- const RelocationRef &RelRef,
- SmallVectorImpl<char> &Result) {
+Error llvm::getMachORelocationValueString(const MachOObjectFile *Obj,
+ const RelocationRef &RelRef,
+ SmallVectorImpl<char> &Result) {
DataRefImpl Rel = RelRef.getRawDataRefImpl();
MachO::any_relocation_info RE = Obj->getRelocation(Rel);
@@ -488,7 +487,7 @@ llvm::getMachORelocationValueString(const MachOObjectFile *Obj,
// Generic relocation types...
switch (Type) {
case MachO::GENERIC_RELOC_PAIR: // prints no info
- return std::error_code();
+ return Error::success();
case MachO::GENERIC_RELOC_SECTDIFF: {
DataRefImpl RelNext = Rel;
Obj->moveRelocationNext(RelNext);
@@ -588,7 +587,7 @@ llvm::getMachORelocationValueString(const MachOObjectFile *Obj,
Fmt.flush();
Result.append(FmtBuf.begin(), FmtBuf.end());
- return std::error_code();
+ return Error::success();
}
static void PrintIndirectSymbolTable(MachOObjectFile *O, bool verbose,
OpenPOWER on IntegriCloud