diff options
| author | svnmir <svnmir@FreeBSD.org> | 2015-08-07 23:01:46 +0000 |
|---|---|---|
| committer | svnmir <svnmir@FreeBSD.org> | 2015-08-07 23:01:46 +0000 |
| commit | c5dd590220d0afe971d065bfe9324f549dd00968 (patch) | |
| tree | 52d1861acda1205241ee35a94aa63129c604d469 /tools/llvm-readobj/Win64EHDumper.cpp | |
| parent | d2fc7c7001ed3babcd0106d15dd70224abfb6f29 (diff) | |
| download | FreeBSD-src-c5dd590220d0afe971d065bfe9324f549dd00968.zip FreeBSD-src-c5dd590220d0afe971d065bfe9324f549dd00968.tar.gz | |
Vendor import of llvm trunk r242221:
https://llvm.org/svn/llvm-project/llvm/trunk@242221
Diffstat (limited to 'tools/llvm-readobj/Win64EHDumper.cpp')
| -rw-r--r-- | tools/llvm-readobj/Win64EHDumper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/llvm-readobj/Win64EHDumper.cpp b/tools/llvm-readobj/Win64EHDumper.cpp index 5a8af41..f57eea2 100644 --- a/tools/llvm-readobj/Win64EHDumper.cpp +++ b/tools/llvm-readobj/Win64EHDumper.cpp @@ -144,8 +144,10 @@ static std::error_code resolveRelocation(const Dumper::Context &Ctx, Ctx.ResolveSymbol(Section, Offset, Symbol, Ctx.UserData)) return EC; - if (std::error_code EC = Symbol.getAddress(ResolvedAddress)) + ErrorOr<uint64_t> ResolvedAddressOrErr = Symbol.getAddress(); + if (std::error_code EC = ResolvedAddressOrErr.getError()) return EC; + ResolvedAddress = *ResolvedAddressOrErr; section_iterator SI = Ctx.COFF.section_begin(); if (std::error_code EC = Symbol.getSection(SI)) |
