Skip to content

Commit a3ede2b

Browse files
jfbastienjfbastien
committed
format
1 parent cb91e71 commit a3ede2b

File tree

2 files changed

+50
-55
lines changed

2 files changed

+50
-55
lines changed

‎lib/Serialization/Deserialization.cpp

Lines changed: 48 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,10 @@ ParameterList *ModuleFile::readParameterList() {
252252
using namespace decls_block;
253253

254254
SmallVector<uint64_t, 8> scratch;
255-
llvm::BitstreamEntry entry = fatalIfUnexpected(
256-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
257-
unsigned recordID = fatalIfUnexpected(DeclTypeCursor.readRecord(entry.ID, scratch));
255+
llvm::BitstreamEntry entry =
256+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
257+
unsigned recordID =
258+
fatalIfUnexpected(DeclTypeCursor.readRecord(entry.ID, scratch));
258259
assert(recordID == PARAMETERLIST);
259260
(void) recordID;
260261

@@ -286,8 +287,8 @@ Expected<Pattern *> ModuleFile::readPattern(DeclContext *owningDC) {
286287
SmallVector<uint64_t, 8> scratch;
287288

288289
BCOffsetRAII restoreOffset(DeclTypeCursor);
289-
llvm::BitstreamEntry next = fatalIfUnexpected(
290-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
290+
llvm::BitstreamEntry next =
291+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
291292
if (next.Kind != llvm::BitstreamEntry::Record) {
292293
error();
293294
return nullptr;
@@ -336,8 +337,7 @@ Expected<Pattern *> ModuleFile::readPattern(DeclContext *owningDC) {
336337
next = fatalIfUnexpected(DeclTypeCursor.advance());
337338
assert(next.Kind == llvm::BitstreamEntry::Record);
338339

339-
kind = fatalIfUnexpected(
340-
DeclTypeCursor.readRecord(next.ID, scratch));
340+
kind = fatalIfUnexpected(DeclTypeCursor.readRecord(next.ID, scratch));
341341
assert(kind == decls_block::TUPLE_PATTERN_ELT);
342342

343343
// FIXME: Add something for this record or remove it.
@@ -429,8 +429,8 @@ SILLayout *ModuleFile::readSILLayout(llvm::BitstreamCursor &Cursor) {
429429

430430
SmallVector<uint64_t, 16> scratch;
431431

432-
llvm::BitstreamEntry next = fatalIfUnexpected(
433-
Cursor.advance(AF_DontPopBlockAtEnd));
432+
llvm::BitstreamEntry next =
433+
fatalIfUnexpected(Cursor.advance(AF_DontPopBlockAtEnd));
434434
assert(next.Kind == llvm::BitstreamEntry::Record);
435435

436436
unsigned kind = fatalIfUnexpected(Cursor.readRecord(next.ID, scratch));
@@ -469,8 +469,8 @@ ProtocolConformanceRef ModuleFile::readConformance(
469469

470470
SmallVector<uint64_t, 16> scratch;
471471

472-
llvm::BitstreamEntry next = fatalIfUnexpected(
473-
Cursor.advance(AF_DontPopBlockAtEnd));
472+
llvm::BitstreamEntry next =
473+
fatalIfUnexpected(Cursor.advance(AF_DontPopBlockAtEnd));
474474
assert(next.Kind == llvm::BitstreamEntry::Record);
475475

476476
if (getContext().Stats)
@@ -610,8 +610,7 @@ NormalProtocolConformance *ModuleFile::readNormalConformance(
610610
// Find the conformance record.
611611
BCOffsetRAII restoreOffset(DeclTypeCursor);
612612
fatalIfNotSuccess(DeclTypeCursor.JumpToBit(conformanceEntry));
613-
llvm::BitstreamEntry entry =
614-
fatalIfUnexpected(DeclTypeCursor.advance());
613+
llvm::BitstreamEntry entry = fatalIfUnexpected(DeclTypeCursor.advance());
615614
if (entry.Kind != llvm::BitstreamEntry::Record) {
616615
error();
617616
return nullptr;
@@ -675,13 +674,13 @@ GenericParamList *ModuleFile::maybeReadGenericParams(DeclContext *DC) {
675674
SmallVector<uint64_t, 8> scratch;
676675
StringRef blobData;
677676

678-
llvm::BitstreamEntry next = fatalIfUnexpected(
679-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
677+
llvm::BitstreamEntry next =
678+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
680679
if (next.Kind != llvm::BitstreamEntry::Record)
681680
return nullptr;
682681

683-
unsigned kind = fatalIfUnexpected(
684-
DeclTypeCursor.readRecord(next.ID, scratch, &blobData));
682+
unsigned kind =
683+
fatalIfUnexpected(DeclTypeCursor.readRecord(next.ID, scratch, &blobData));
685684
if (kind != GENERIC_PARAM_LIST)
686685
return nullptr;
687686
lastRecordOffset.reset();
@@ -718,8 +717,8 @@ void ModuleFile::readGenericRequirements(
718717
lastRecordOffset.reset();
719718
bool shouldContinue = true;
720719

721-
llvm::BitstreamEntry entry = fatalIfUnexpected(
722-
Cursor.advance(AF_DontPopBlockAtEnd));
720+
llvm::BitstreamEntry entry =
721+
fatalIfUnexpected(Cursor.advance(AF_DontPopBlockAtEnd));
723722
if (entry.Kind != llvm::BitstreamEntry::Record)
724723
break;
725724

@@ -910,8 +909,8 @@ GenericSignature *ModuleFile::getGenericSignature(
910909
StringRef blobData;
911910
SmallVector<uint64_t, 8> scratch;
912911

913-
llvm::BitstreamEntry entry = fatalIfUnexpected(
914-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
912+
llvm::BitstreamEntry entry =
913+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
915914
if (entry.Kind != llvm::BitstreamEntry::Record) {
916915
error();
917916
return nullptr;
@@ -1002,8 +1001,8 @@ ModuleFile::getGenericSignatureOrEnvironment(
10021001
// own internal tracking.)
10031002
BCOffsetRAII lastRecordOffset(DeclTypeCursor);
10041003

1005-
llvm::BitstreamEntry entry = fatalIfUnexpected(
1006-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
1004+
llvm::BitstreamEntry entry =
1005+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
10071006
if (entry.Kind != llvm::BitstreamEntry::Record)
10081007
return result;
10091008

@@ -1108,8 +1107,8 @@ SubstitutionMap ModuleFile::getSubstitutionMap(
11081107
DeserializingEntityRAII deserializingEntity(*this);
11091108

11101109
// Read the substitution map.
1111-
llvm::BitstreamEntry entry = fatalIfUnexpected(
1112-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
1110+
llvm::BitstreamEntry entry =
1111+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
11131112
if (entry.Kind != llvm::BitstreamEntry::Record) {
11141113
error();
11151114
return SubstitutionMap();
@@ -1170,15 +1169,15 @@ SubstitutionMap ModuleFile::getSubstitutionMap(
11701169
bool ModuleFile::readDefaultWitnessTable(ProtocolDecl *proto) {
11711170
using namespace decls_block;
11721171

1173-
llvm::BitstreamEntry entry = fatalIfUnexpected(
1174-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
1172+
llvm::BitstreamEntry entry =
1173+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
11751174
if (entry.Kind != llvm::BitstreamEntry::Record)
11761175
return true;
11771176

11781177
SmallVector<uint64_t, 16> witnessIDBuffer;
11791178

1180-
unsigned kind = fatalIfUnexpected(
1181-
DeclTypeCursor.readRecord(entry.ID, witnessIDBuffer));
1179+
unsigned kind =
1180+
fatalIfUnexpected(DeclTypeCursor.readRecord(entry.ID, witnessIDBuffer));
11821181
assert(kind == DEFAULT_WITNESS_TABLE);
11831182
(void)kind;
11841183

@@ -1327,8 +1326,8 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
13271326
assert(baseModule && "missing dependency");
13281327
PrettyXRefTrace pathTrace(*baseModule);
13291328

1330-
llvm::BitstreamEntry entry = fatalIfUnexpected(
1331-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
1329+
llvm::BitstreamEntry entry =
1330+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
13321331
if (entry.Kind != llvm::BitstreamEntry::Record) {
13331332
error();
13341333
return nullptr;
@@ -1455,8 +1454,8 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
14551454
auto getXRefDeclNameForError = [&]() -> DeclName {
14561455
DeclName result = pathTrace.getLastName();
14571456
while (--pathLen) {
1458-
llvm::BitstreamEntry entry = fatalIfUnexpected(
1459-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
1457+
llvm::BitstreamEntry entry =
1458+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
14601459
if (entry.Kind != llvm::BitstreamEntry::Record)
14611460
return Identifier();
14621461

@@ -1531,8 +1530,8 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
15311530

15321531
// For remaining path pieces, filter or drill down into the results we have.
15331532
while (--pathLen) {
1534-
llvm::BitstreamEntry entry = fatalIfUnexpected(
1535-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
1533+
llvm::BitstreamEntry entry =
1534+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
15361535
if (entry.Kind != llvm::BitstreamEntry::Record) {
15371536
error();
15381537
return nullptr;
@@ -1948,8 +1947,7 @@ DeclContext *ModuleFile::getLocalDeclContext(DeclContextID DCID) {
19481947

19491948
BCOffsetRAII restoreOffset(DeclTypeCursor);
19501949
fatalIfNotSuccess(DeclTypeCursor.JumpToBit(declContextOrOffset));
1951-
llvm::BitstreamEntry entry =
1952-
fatalIfUnexpected(DeclTypeCursor.advance());
1950+
llvm::BitstreamEntry entry = fatalIfUnexpected(DeclTypeCursor.advance());
19531951

19541952
if (entry.Kind != llvm::BitstreamEntry::Record) {
19551953
error();
@@ -2048,8 +2046,7 @@ DeclContext *ModuleFile::getDeclContext(DeclContextID DCID) {
20482046

20492047
BCOffsetRAII restoreOffset(DeclTypeCursor);
20502048
fatalIfNotSuccess(DeclTypeCursor.JumpToBit(declContextOrOffset));
2051-
llvm::BitstreamEntry entry =
2052-
fatalIfUnexpected(DeclTypeCursor.advance());
2049+
llvm::BitstreamEntry entry = fatalIfUnexpected(DeclTypeCursor.advance());
20532050

20542051
if (entry.Kind != llvm::BitstreamEntry::Record) {
20552052
error();
@@ -4791,8 +4788,8 @@ class swift::TypeDeserializer {
47914788
// The tuple record itself is empty. Read all trailing elements.
47924789
SmallVector<TupleTypeElt, 8> elements;
47934790
while (true) {
4794-
llvm::BitstreamEntry entry = MF.fatalIfUnexpected(
4795-
MF.DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
4791+
llvm::BitstreamEntry entry =
4792+
MF.fatalIfUnexpected(MF.DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
47964793
if (entry.Kind != llvm::BitstreamEntry::Record)
47974794
break;
47984795

@@ -4858,8 +4855,8 @@ class swift::TypeDeserializer {
48584855

48594856
SmallVector<AnyFunctionType::Param, 8> params;
48604857
while (true) {
4861-
llvm::BitstreamEntry entry = MF.fatalIfUnexpected(
4862-
MF.DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
4858+
llvm::BitstreamEntry entry =
4859+
MF.fatalIfUnexpected(MF.DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
48634860
if (entry.Kind != llvm::BitstreamEntry::Record)
48644861
break;
48654862

@@ -5595,17 +5592,16 @@ void ModuleFile::loadAllMembers(Decl *container, uint64_t contextData) {
55955592

55965593
BCOffsetRAII restoreOffset(DeclTypeCursor);
55975594
fatalIfNotSuccess(DeclTypeCursor.JumpToBit(contextData));
5598-
llvm::BitstreamEntry entry =
5599-
fatalIfUnexpected(DeclTypeCursor.advance());
5595+
llvm::BitstreamEntry entry = fatalIfUnexpected(DeclTypeCursor.advance());
56005596
if (entry.Kind != llvm::BitstreamEntry::Record) {
56015597
error();
56025598
return;
56035599
}
56045600

56055601
SmallVector<uint64_t, 16> memberIDBuffer;
56065602

5607-
unsigned kind = fatalIfUnexpected(
5608-
DeclTypeCursor.readRecord(entry.ID, memberIDBuffer));
5603+
unsigned kind =
5604+
fatalIfUnexpected(DeclTypeCursor.readRecord(entry.ID, memberIDBuffer));
56095605
assert(kind == decls_block::MEMBERS);
56105606
(void)kind;
56115607

@@ -5688,8 +5684,7 @@ void ModuleFile::finishNormalConformance(NormalProtocolConformance *conformance,
56885684
// Find the conformance record.
56895685
BCOffsetRAII restoreOffset(DeclTypeCursor);
56905686
fatalIfNotSuccess(DeclTypeCursor.JumpToBit(contextData));
5691-
llvm::BitstreamEntry entry =
5692-
fatalIfUnexpected(DeclTypeCursor.advance());
5687+
llvm::BitstreamEntry entry = fatalIfUnexpected(DeclTypeCursor.advance());
56935688
assert(entry.Kind == llvm::BitstreamEntry::Record &&
56945689
"registered lazy loader incorrectly");
56955690

@@ -5923,8 +5918,8 @@ Optional<StringRef> ModuleFile::maybeReadInlinableBodyText() {
59235918
BCOffsetRAII restoreOffset(DeclTypeCursor);
59245919
StringRef blobData;
59255920

5926-
llvm::BitstreamEntry next = fatalIfUnexpected(
5927-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
5921+
llvm::BitstreamEntry next =
5922+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
59285923
if (next.Kind != llvm::BitstreamEntry::Record)
59295924
return None;
59305925

@@ -5950,8 +5945,8 @@ Optional<ForeignErrorConvention> ModuleFile::maybeReadForeignErrorConvention() {
59505945

59515946
BCOffsetRAII restoreOffset(DeclTypeCursor);
59525947

5953-
llvm::BitstreamEntry next = fatalIfUnexpected(
5954-
DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
5948+
llvm::BitstreamEntry next =
5949+
fatalIfUnexpected(DeclTypeCursor.advance(AF_DontPopBlockAtEnd));
59555950
if (next.Kind != llvm::BitstreamEntry::Record)
59565951
return None;
59575952

‎lib/Serialization/ModuleFile.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2230,8 +2230,8 @@ ModuleFile::loadNamedMembers(const IterableDeclContext *IDC, DeclBaseName N,
22302230
if (!subTable) {
22312231
BCOffsetRAII restoreOffset(DeclMemberTablesCursor);
22322232
fatalIfNotSuccess(DeclMemberTablesCursor.JumpToBit(subTableOffset));
2233-
llvm::BitstreamEntry entry = fatalIfUnexpected(
2234-
DeclMemberTablesCursor.advance());
2233+
llvm::BitstreamEntry entry =
2234+
fatalIfUnexpected(DeclMemberTablesCursor.advance());
22352235
if (entry.Kind != llvm::BitstreamEntry::Record) {
22362236
error();
22372237
return None;

0 commit comments

Comments
 (0)