diff options
| author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2021-10-21 15:57:15 -0700 |
|---|---|---|
| committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2021-10-22 12:40:10 -0700 |
| commit | 2410fb4616b2c08bbaddd44e6c11da8285fbd1d3 (patch) | |
| tree | 840f4d7df58e12c26f2801838995c9bbf3193f7b /llvm/lib/Object/ObjectFile.cpp | |
| parent | c4ba1108dd6065dd3cce5edafcebbb6fe4fb3a0e (diff) | |
| download | llvm-2410fb4616b2c08bbaddd44e6c11da8285fbd1d3.zip llvm-2410fb4616b2c08bbaddd44e6c11da8285fbd1d3.tar.gz llvm-2410fb4616b2c08bbaddd44e6c11da8285fbd1d3.tar.bz2 | |
Support: Use Expected<T>::moveInto() in a few places
These are some usage examples for `Expected<T>::moveInto()`.
Differential Revision: https://reviews.llvm.org/D112280
Diffstat (limited to 'llvm/lib/Object/ObjectFile.cpp')
| -rw-r--r-- | llvm/lib/Object/ObjectFile.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/llvm/lib/Object/ObjectFile.cpp b/llvm/lib/Object/ObjectFile.cpp index 5c89443..6fd02f3 100644 --- a/llvm/lib/Object/ObjectFile.cpp +++ b/llvm/lib/Object/ObjectFile.cpp @@ -55,14 +55,15 @@ bool SectionRef::containsSymbol(SymbolRef S) const { } Expected<uint64_t> ObjectFile::getSymbolValue(DataRefImpl Ref) const { - if (Expected<uint32_t> FlagsOrErr = getSymbolFlags(Ref)) { - if (*FlagsOrErr & SymbolRef::SF_Undefined) - return 0; - if (*FlagsOrErr & SymbolRef::SF_Common) - return getCommonSymbolSize(Ref); - } else + uint32_t Flags; + if (Error E = getSymbolFlags(Ref).moveInto(Flags)) // TODO: Test this error. - return FlagsOrErr.takeError(); + return std::move(E); + + if (Flags & SymbolRef::SF_Undefined) + return 0; + if (Flags & SymbolRef::SF_Common) + return getCommonSymbolSize(Ref); return getSymbolValueImpl(Ref); } |