@@ -960,11 +960,11 @@ namespace {
960
960
// / Return true if the witness table requires runtime instantiation to
961
961
// / handle resiliently-added requirements with default implementations.
962
962
// /
963
- // / If ignoreGenericity is true, skip the optimization for non-generic
964
- // / conformances are considered non-resilient.
963
+ // / If disableOptimizations is true, skip optimizations that treat
964
+ // / formally-resilient conformances as non-resilient.
965
965
bool IRGenModule::isResilientConformance (
966
966
const NormalProtocolConformance *conformance,
967
- bool ignoreGenericity
967
+ bool disableOptimizations
968
968
) {
969
969
// If the protocol is not resilient, the conformance is not resilient
970
970
// either.
@@ -998,17 +998,17 @@ bool IRGenModule::isResilientConformance(
998
998
// resiliently become dependent.
999
999
if (!conformance->getDeclContext ()->isGenericContext () &&
1000
1000
conformanceModule == conformance->getProtocol ()->getParentModule () &&
1001
- !ignoreGenericity )
1001
+ !disableOptimizations )
1002
1002
return false ;
1003
1003
1004
1004
// We have a resilient conformance.
1005
1005
return true ;
1006
1006
}
1007
1007
1008
1008
bool IRGenModule::isResilientConformance (const RootProtocolConformance *root,
1009
- bool ignoreGenericity ) {
1009
+ bool disableOptimizations ) {
1010
1010
if (auto normal = dyn_cast<NormalProtocolConformance>(root))
1011
- return isResilientConformance (normal, ignoreGenericity );
1011
+ return isResilientConformance (normal, disableOptimizations );
1012
1012
// Self-conformances never require this.
1013
1013
return false ;
1014
1014
}
@@ -1193,7 +1193,7 @@ bool IRGenModule::isDependentConformance(
1193
1193
llvm::SmallPtrSet<const NormalProtocolConformance *, 4 > visited;
1194
1194
return ::isDependentConformance (
1195
1195
*this , conformance,
1196
- isResilientConformance (conformance, /* ignoreGenericity =*/ true ),
1196
+ isResilientConformance (conformance, /* disableOptimizations =*/ true ),
1197
1197
visited);
1198
1198
}
1199
1199
0 commit comments