Skip to content

Commit 6269170

Browse files
committed
Don't rely on implicit tuple initialization.
1 parent 06bbc70 commit 6269170

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

lib/Frontend/ModuleInterfaceSupport.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,10 @@ class InheritedProtocolCollector {
366366
if (canPrintNormally)
367367
IncludedProtocols.push_back(protoTy->getDecl());
368368
else
369-
ExtraProtocols.push_back({protoTy->getDecl(),
369+
ExtraProtocols.push_back(
370+
ProtocolAndAvailability(protoTy->getDecl(),
370371
getAvailabilityAttrs(D, availableAttrs),
371-
inherited.isUnchecked});
372+
inherited.isUnchecked));
372373
}
373374
// FIXME: This ignores layout constraints, but currently we don't support
374375
// any of those besides 'AnyObject'.
@@ -385,9 +386,10 @@ class InheritedProtocolCollector {
385386
for (auto *conf : localConformances) {
386387
if (conf->getSourceKind() != ConformanceEntryKind::Synthesized)
387388
continue;
388-
ExtraProtocols.push_back({conf->getProtocol(),
389+
ExtraProtocols.push_back(
390+
ProtocolAndAvailability(conf->getProtocol(),
389391
getAvailabilityAttrs(D, availableAttrs),
390-
isUncheckedConformance(conf)});
392+
isUncheckedConformance(conf)));
391393
}
392394
}
393395
}
@@ -568,7 +570,8 @@ class InheritedProtocolCollector {
568570
if (isPublicOrUsableFromInline(inherited) &&
569571
conformanceDeclaredInModule(M, nominal, inherited) &&
570572
!M->isImportedImplementationOnly(inherited->getParentModule())) {
571-
protocolsToPrint.push_back({inherited, availability, isUnchecked});
573+
protocolsToPrint.push_back(
574+
ProtocolAndAvailability(inherited, availability, isUnchecked));
572575
return TypeWalker::Action::SkipChildren;
573576
}
574577

0 commit comments

Comments
 (0)