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

Replace materializeForSet with the modify coroutine.

Browse Source 
Most of this patch is just removing special cases for materializeForSet
or other fairly mechanical replacements.  Unfortunately, the rest is
still a fairly big change, and not one that can be easily split apart
because of the quite reasonable reliance on metaprogramming throughout
the compiler.  And, of course, there are a bunch of test updates that
have to be sync'ed with the actual change to code-generation.

This is SR-7134.
This commit is contained in:
John McCall
2018-08-18 02:42:12 -04:00
parent 7eb703bd74
commit b80618fc80
100 changed files with 2049 additions and 3334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/SIL/SILDeclRef.cpp
View File

@@ -273,12 +273,21 @@ SILLinkage SILDeclRef::getLinkage(ForDefinition_t forDefinition) const {
return maybeAddExternal(SILLinkage::PublicNonABI);
}
bool neverPublic = false;
enum class Limit {
/// No limit.
None,
/// The declaration is emitted on-demand; it should end up with internal
/// or shared linkage.
OnDemand,
/// The declaration should never be made public.
NeverPublic
};
auto limit = Limit::None;
// ivar initializers and destroyers are completely contained within the class
// from which they come, and never get seen externally.
if (isIVarInitializerOrDestroyer()) {
neverPublic = true;
limit = Limit::NeverPublic;
}
// Stored property initializers get the linkage of their containing type.
@@ -305,13 +314,21 @@ SILLinkage SILDeclRef::getLinkage(ForDefinition_t forDefinition) const {
// FIXME: This should always be true.
if (d->getDeclContext()->getParentModule()->getResilienceStrategy() ==
ResilienceStrategy::Resilient)
neverPublic = true;
limit = Limit::NeverPublic;
}
// The global addressor is never public for resilient globals.
if (kind == Kind::GlobalAccessor) {
if (cast<VarDecl>(d)->isResilient()) {
neverPublic = true;
limit = Limit::NeverPublic;
}
}
// Forced-static-dispatch functions are created on-demand and have
// at best shared linkage.
if (auto fn = dyn_cast<FuncDecl>(d)) {
if (fn->hasForcedStaticDispatch()) {
limit = Limit::OnDemand;
}
}
@@ -332,11 +349,15 @@ SILLinkage SILDeclRef::getLinkage(ForDefinition_t forDefinition) const {
return maybeAddExternal(SILLinkage::Private);
case AccessLevel::Internal:
if (limit == Limit::OnDemand)
return SILLinkage::Shared;
return maybeAddExternal(SILLinkage::Hidden);
case AccessLevel::Public:
case AccessLevel::Open:
if (neverPublic)
if (limit == Limit::OnDemand)
return SILLinkage::Shared;
if (limit == Limit::NeverPublic)
return maybeAddExternal(SILLinkage::Hidden);
return maybeAddExternal(SILLinkage::Public);
}