File tree Expand file tree Collapse file tree 5 files changed +3
-20
lines changed Expand file tree Collapse file tree 5 files changed +3
-20
lines changed Original file line number Diff line number Diff line change @@ -112,13 +112,7 @@ enum class ResilienceStrategy : unsigned {
112
112
// / Non-inlineable function bodies: resilient
113
113
// /
114
114
// / This is the behavior with -enable-resilience.
115
- Resilient,
116
-
117
- // / Public nominal types: fragile
118
- // / Non-inlineable function bodies: fragile
119
- // /
120
- // / This is the behavior with -sil-serialize-all.
121
- Fragile
115
+ Resilient
122
116
};
123
117
124
118
// / The minimum unit of compilation.
Original file line number Diff line number Diff line change @@ -1459,7 +1459,6 @@ bool AbstractStorageDecl::hasFixedLayout() const {
1459
1459
switch (getDeclContext ()->getParentModule ()->getResilienceStrategy ()) {
1460
1460
case ResilienceStrategy::Resilient:
1461
1461
return false ;
1462
- case ResilienceStrategy::Fragile:
1463
1462
case ResilienceStrategy::Default:
1464
1463
return true ;
1465
1464
}
@@ -2217,7 +2216,6 @@ bool NominalTypeDecl::hasFixedLayout() const {
2217
2216
switch (getParentModule ()->getResilienceStrategy ()) {
2218
2217
case ResilienceStrategy::Resilient:
2219
2218
return false ;
2220
- case ResilienceStrategy::Fragile:
2221
2219
case ResilienceStrategy::Default:
2222
2220
return true ;
2223
2221
}
Original file line number Diff line number Diff line change @@ -1338,8 +1338,8 @@ bool LinkEntity::isFragile(ForDefinition_t isDefinition) const {
1338
1338
auto conformance = getProtocolConformance ();
1339
1339
1340
1340
auto conformanceModule = conformance->getDeclContext ()->getParentModule ();
1341
- auto isCompletelySerialized = conformanceModule-> getResilienceStrategy () ==
1342
- ResilienceStrategy::Fragile ;
1341
+ auto isCompletelySerialized =
1342
+ conformanceModule-> getOptions (). SILSerializeWitnessTables ;
1343
1343
1344
1344
// The conformance is fragile if it is in a -sil-serialize-all module.
1345
1345
return isCompletelySerialized;
Original file line number Diff line number Diff line change @@ -54,11 +54,6 @@ FormalLinkage swift::getDeclLinkage(const ValueDecl *D) {
54
54
case AccessLevel::Open:
55
55
return FormalLinkage::PublicUnique;
56
56
case AccessLevel::Internal:
57
- // If we're serializing all function bodies, type metadata for internal
58
- // types needs to be public too.
59
- if (D->getDeclContext ()->getParentModule ()->getResilienceStrategy ()
60
- == ResilienceStrategy::Fragile)
61
- return FormalLinkage::PublicUnique;
62
57
return FormalLinkage::HiddenUnique;
63
58
case AccessLevel::FilePrivate:
64
59
case AccessLevel::Private:
Original file line number Diff line number Diff line change @@ -497,10 +497,6 @@ void SerializedASTFile::collectLinkLibraries(
497
497
if (isSIB ()) {
498
498
collectLinkLibrariesFromImports (callback);
499
499
} else {
500
- if (File.getAssociatedModule ()->getResilienceStrategy ()
501
- == ResilienceStrategy::Fragile) {
502
- collectLinkLibrariesFromImports (callback);
503
- }
504
500
File.collectLinkLibraries (callback);
505
501
}
506
502
}
You can’t perform that action at this time.
0 commit comments