Skip to content

Commit 692575f

Browse files
committed
Remove ResilientStrategy::Fragile
1 parent 8e9ce01 commit 692575f

File tree

5 files changed

+3
-20
lines changed

5 files changed

+3
-20
lines changed

include/swift/AST/Module.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,7 @@ enum class ResilienceStrategy : unsigned {
112112
/// Non-inlineable function bodies: resilient
113113
///
114114
/// 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
122116
};
123117

124118
/// The minimum unit of compilation.

lib/AST/Decl.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,6 @@ bool AbstractStorageDecl::hasFixedLayout() const {
14591459
switch (getDeclContext()->getParentModule()->getResilienceStrategy()) {
14601460
case ResilienceStrategy::Resilient:
14611461
return false;
1462-
case ResilienceStrategy::Fragile:
14631462
case ResilienceStrategy::Default:
14641463
return true;
14651464
}
@@ -2217,7 +2216,6 @@ bool NominalTypeDecl::hasFixedLayout() const {
22172216
switch (getParentModule()->getResilienceStrategy()) {
22182217
case ResilienceStrategy::Resilient:
22192218
return false;
2220-
case ResilienceStrategy::Fragile:
22212219
case ResilienceStrategy::Default:
22222220
return true;
22232221
}

lib/IRGen/GenDecl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,8 +1338,8 @@ bool LinkEntity::isFragile(ForDefinition_t isDefinition) const {
13381338
auto conformance = getProtocolConformance();
13391339

13401340
auto conformanceModule = conformance->getDeclContext()->getParentModule();
1341-
auto isCompletelySerialized = conformanceModule->getResilienceStrategy() ==
1342-
ResilienceStrategy::Fragile;
1341+
auto isCompletelySerialized =
1342+
conformanceModule->getOptions().SILSerializeWitnessTables;
13431343

13441344
// The conformance is fragile if it is in a -sil-serialize-all module.
13451345
return isCompletelySerialized;

lib/SIL/SIL.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ FormalLinkage swift::getDeclLinkage(const ValueDecl *D) {
5454
case AccessLevel::Open:
5555
return FormalLinkage::PublicUnique;
5656
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;
6257
return FormalLinkage::HiddenUnique;
6358
case AccessLevel::FilePrivate:
6459
case AccessLevel::Private:

lib/Serialization/SerializedModuleLoader.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,6 @@ void SerializedASTFile::collectLinkLibraries(
497497
if (isSIB()) {
498498
collectLinkLibrariesFromImports(callback);
499499
} else {
500-
if (File.getAssociatedModule()->getResilienceStrategy()
501-
== ResilienceStrategy::Fragile) {
502-
collectLinkLibrariesFromImports(callback);
503-
}
504500
File.collectLinkLibraries(callback);
505501
}
506502
}

0 commit comments

Comments
 (0)