diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-06-30 20:32:26 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-06-30 20:32:26 +0000 |
| commit | 10fcac7b0768dfb1d9fb3030f2bb664ad8e4e65b (patch) | |
| tree | 061af9263ce956b767a139713c0d8ab2862b06a2 /llvm/lib/Object/Object.cpp | |
| parent | 391e53812a5ec4ad8ef8cc4b9a9b81b1a7caf762 (diff) | |
| download | bcm5719-llvm-10fcac7b0768dfb1d9fb3030f2bb664ad8e4e65b.tar.gz bcm5719-llvm-10fcac7b0768dfb1d9fb3030f2bb664ad8e4e65b.zip | |
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
Diffstat (limited to 'llvm/lib/Object/Object.cpp')
| -rw-r--r-- | llvm/lib/Object/Object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Object/Object.cpp b/llvm/lib/Object/Object.cpp index 173dd62fc32..9582739def4 100644 --- a/llvm/lib/Object/Object.cpp +++ b/llvm/lib/Object/Object.cpp @@ -192,10 +192,10 @@ uint64_t LLVMGetSymbolSize(LLVMSymbolIteratorRef SI) { // RelocationRef accessors uint64_t LLVMGetRelocationAddress(LLVMRelocationIteratorRef RI) { - uint64_t ret; - if (std::error_code ec = (*unwrap(RI))->getAddress(ret)) - report_fatal_error(ec.message()); - return ret; + ErrorOr<uint64_t> Ret = (*unwrap(RI))->getAddress(); + if (std::error_code EC = Ret.getError()) + report_fatal_error(EC.message()); + return *Ret; } uint64_t LLVMGetRelocationOffset(LLVMRelocationIteratorRef RI) { |
