averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on implicit tuple initialization.

Browse Source
This commit is contained in:
Doug Gregor
2021-07-11 18:58:43 -07:00
parent 06bbc70b3e
commit 6269170dd0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Frontend/ModuleInterfaceSupport.cpp
View File

@@ -366,9 +366,10 @@ class InheritedProtocolCollector {
if (canPrintNormally)
IncludedProtocols.push_back(protoTy->getDecl());
else
ExtraProtocols.push_back({protoTy->getDecl(),
ExtraProtocols.push_back(
ProtocolAndAvailability(protoTy->getDecl(),
getAvailabilityAttrs(D, availableAttrs),
inherited.isUnchecked});
inherited.isUnchecked));
}
// FIXME: This ignores layout constraints, but currently we don't support
// any of those besides 'AnyObject'.
@@ -385,9 +386,10 @@ class InheritedProtocolCollector {
for (auto *conf : localConformances) {
if (conf->getSourceKind() != ConformanceEntryKind::Synthesized)
continue;
ExtraProtocols.push_back({conf->getProtocol(),
ExtraProtocols.push_back(
ProtocolAndAvailability(conf->getProtocol(),
getAvailabilityAttrs(D, availableAttrs),
isUncheckedConformance(conf)});
isUncheckedConformance(conf)));
}
}
}
@@ -568,7 +570,8 @@ public:
if (isPublicOrUsableFromInline(inherited) &&
conformanceDeclaredInModule(M, nominal, inherited) &&
!M->isImportedImplementationOnly(inherited->getParentModule())) {
protocolsToPrint.push_back({inherited, availability, isUnchecked});
protocolsToPrint.push_back(
ProtocolAndAvailability(inherited, availability, isUnchecked));
return TypeWalker::Action::SkipChildren;
}