caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support: Use Expected<T>::moveInto() in a few places

Browse Source 
These are some usage examples for `Expected<T>::moveInto()`.

Differential Revision: https://reviews.llvm.org/D112280
This commit is contained in:
Duncan P. N. Exon Smith
2021-10-21 15:57:15 -07:00
parent c4ba1108dd
commit 2410fb4616
5 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@@ -179,10 +179,8 @@ static Expected<std::string> readIdentificationBlock(BitstreamCursor &Stream) {
while (true) {
BitstreamEntry Entry;
if (Expected<BitstreamEntry> Res = Stream.advance())
Entry = Res.get();
else
return Res.takeError();
if (Error E = Stream.advance().moveInto(Entry))
return std::move(E);
switch (Entry.Kind) {
default:
@@ -226,10 +224,8 @@ static Expected<std::string> readIdentificationCode(BitstreamCursor &Stream) {
return "";
BitstreamEntry Entry;
if (Expected<BitstreamEntry> Res = Stream.advance())
Entry = std::move(Res.get());
else
return Res.takeError();
if (Error E = Stream.advance().moveInto(Entry))
return std::move(E);
switch (Entry.Kind) {
case BitstreamEntry::EndBlock:
@@ -305,10 +301,8 @@ static Expected<bool> hasObjCCategory(BitstreamCursor &Stream) {
// need to understand them all.
while (true) {
BitstreamEntry Entry;
if (Expected<BitstreamEntry> Res = Stream.advance())
Entry = std::move(Res.get());
else
return Res.takeError();
if (Error E = Stream.advance().moveInto(Entry))
return std::move(E);
switch (Entry.Kind) {
case BitstreamEntry::Error: