summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Object/Object.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-07-02 20:55:21 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-07-02 20:55:21 +0000
commit5d0c2ffadf84839b951f12a23a163acbd8162d05 (patch)
tree664f4d3c3de6e77a695a2feb4555d261cfc9d9ab /llvm/lib/Object/Object.cpp
parent4dc5adc731a7a157e06c78295de0f1b41846edb3 (diff)
downloadbcm5719-llvm-5d0c2ffadf84839b951f12a23a163acbd8162d05.tar.gz
bcm5719-llvm-5d0c2ffadf84839b951f12a23a163acbd8162d05.zip
Return ErrorOr from SymbolRef::getName.
This function can really fail since the string table offset can be out of bounds. Using ErrorOr makes sure the error is checked. Hopefully a lot of the boilerplate code in tools/* can go away once we have a diagnostic manager in Object. llvm-svn: 241297
Diffstat (limited to 'llvm/lib/Object/Object.cpp')
-rw-r--r--llvm/lib/Object/Object.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Object/Object.cpp b/llvm/lib/Object/Object.cpp
index 9582739def4..945252b2104 100644
--- a/llvm/lib/Object/Object.cpp
+++ b/llvm/lib/Object/Object.cpp
@@ -173,10 +173,10 @@ void LLVMMoveToNextRelocation(LLVMRelocationIteratorRef SI) {
// SymbolRef accessors
const char *LLVMGetSymbolName(LLVMSymbolIteratorRef SI) {
- StringRef ret;
- if (std::error_code ec = (*unwrap(SI))->getName(ret))
- report_fatal_error(ec.message());
- return ret.data();
+ ErrorOr<StringRef> Ret = (*unwrap(SI))->getName();
+ if (std::error_code EC = Ret.getError())
+ report_fatal_error(EC.message());
+ return Ret->data();
}
uint64_t LLVMGetSymbolAddress(LLVMSymbolIteratorRef SI) {
OpenPOWER on IntegriCloud