Skip to content

Commit 7e87847

Browse files
committed
Pick up new changes in master-next, rebase.
1 parent bf0ab47 commit 7e87847

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/Serialization/Deserialization.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,8 @@ static void skipGenericRequirements(llvm::BitstreamCursor &Cursor) {
837837
BCOffsetRAII lastRecordOffset(Cursor);
838838

839839
while (true) {
840-
auto entry = Cursor.advance(AF_DontPopBlockAtEnd);
840+
llvm::BitstreamEntry entry =
841+
fatalIfUnexpected(Cursor.advance(AF_DontPopBlockAtEnd));
841842
if (entry.Kind != llvm::BitstreamEntry::Record)
842843
break;
843844

@@ -5803,7 +5804,7 @@ void ModuleFile::loadRequirementSignature(const ProtocolDecl *decl,
58035804
uint64_t contextData,
58045805
SmallVectorImpl<Requirement> &reqs) {
58055806
BCOffsetRAII restoreOffset(DeclTypeCursor);
5806-
DeclTypeCursor.JumpToBit(contextData);
5807+
fatalIfNotSuccess(DeclTypeCursor.JumpToBit(contextData));
58075808
readGenericRequirements(reqs, DeclTypeCursor);
58085809
}
58095810

0 commit comments

Comments
 (0)