From ff6a0b6a8ee74693e9711973028a8a327adf9cd5 Mon Sep 17 00:00:00 2001 From: Xing GUO Date: Sat, 2 May 2020 14:04:04 +0800 Subject: [Object] Change ObjectFile::getSymbolValue() return type to Expected Summary: In D77860, we have changed `getSymbolFlags()` return type to `Expected`. This change helps bubble the error further up the stack. Reviewers: jhenderson, grimar, JDevlieghere, MaskRay Reviewed By: jhenderson Subscribers: hiraditya, MaskRay, rupprecht, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D79075 --- llvm/lib/Object/ObjectFile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'llvm/lib/Object/ObjectFile.cpp') diff --git a/llvm/lib/Object/ObjectFile.cpp b/llvm/lib/Object/ObjectFile.cpp index fe90378..61b36ea 100644 --- a/llvm/lib/Object/ObjectFile.cpp +++ b/llvm/lib/Object/ObjectFile.cpp @@ -54,15 +54,15 @@ bool SectionRef::containsSymbol(SymbolRef S) const { return *this == **SymSec; } -uint64_t ObjectFile::getSymbolValue(DataRefImpl Ref) const { +Expected ObjectFile::getSymbolValue(DataRefImpl Ref) const { if (Expected FlagsOrErr = getSymbolFlags(Ref)) { if (*FlagsOrErr & SymbolRef::SF_Undefined) return 0; if (*FlagsOrErr & SymbolRef::SF_Common) return getCommonSymbolSize(Ref); } else - // TODO: Actually report errors helpfully. - report_fatal_error(FlagsOrErr.takeError()); + // TODO: Test this error. + return FlagsOrErr.takeError(); return getSymbolValueImpl(Ref); } -- cgit v1.1