From 10fcac7b0768dfb1d9fb3030f2bb664ad8e4e65b Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Tue, 30 Jun 2015 20:32:26 +0000 Subject: Use ErrorOr in getRelocationAdress. We can probably do better in this method, but this is an improvement and enables further ErrorOr cleanups. llvm-svn: 241114 --- llvm/lib/Object/MachOObjectFile.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Object/MachOObjectFile.cpp') diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index d79b4df66bf..51d96770fd7 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -595,15 +595,13 @@ void MachOObjectFile::moveRelocationNext(DataRefImpl &Rel) const { ++Rel.d.b; } -std::error_code MachOObjectFile::getRelocationAddress(DataRefImpl Rel, - uint64_t &Res) const { +ErrorOr MachOObjectFile::getRelocationAddress(DataRefImpl Rel) const { uint64_t Offset = getRelocationOffset(Rel); DataRefImpl Sec; Sec.d.a = Rel.d.a; uint64_t SecAddress = getSectionAddress(Sec); - Res = SecAddress + Offset; - return std::error_code(); + return SecAddress + Offset; } uint64_t MachOObjectFile::getRelocationOffset(DataRefImpl Rel) const { -- cgit v1.2.3