@@ -2711,7 +2711,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
2711
2711
// / \param members The decls within the context.
2712
2712
// / \param isClass True if the context could be a class context (class,
2713
2713
// / class extension, or protocol).
2714
- void writeMembers (DeclID parentID, DeclRange members, bool isClass) {
2714
+ void writeMembers (DeclID parentID, ArrayRef<Decl *> members, bool isClass) {
2715
2715
using namespace decls_block ;
2716
2716
2717
2717
SmallVector<DeclID, 16 > memberIDs;
@@ -2852,7 +2852,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
2852
2852
2853
2853
SmallVector<DeclID, 16 > witnessIDs;
2854
2854
2855
- for (auto member : proto->getMembers ()) {
2855
+ for (auto member : proto->getAllMembers ()) {
2856
2856
if (auto *value = dyn_cast<ValueDecl>(member)) {
2857
2857
auto witness = proto->getDefaultWitness (value);
2858
2858
if (!witness)
@@ -3013,7 +3013,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
3013
3013
for (auto *genericParams : llvm::reverse (allGenericParams))
3014
3014
writeGenericParams (genericParams);
3015
3015
3016
- writeMembers (id, extension->getMembers (), isClassExtension);
3016
+ writeMembers (id, extension->getAllMembers (), isClassExtension);
3017
3017
S.writeConformances (conformances, S.DeclTypeAbbrCodes );
3018
3018
}
3019
3019
@@ -3229,7 +3229,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
3229
3229
3230
3230
3231
3231
writeGenericParams (theStruct->getGenericParams ());
3232
- writeMembers (id, theStruct->getMembers (), false );
3232
+ writeMembers (id, theStruct->getAllMembers (), false );
3233
3233
S.writeConformances (conformances, S.DeclTypeAbbrCodes );
3234
3234
}
3235
3235
@@ -3286,7 +3286,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
3286
3286
inheritedAndDependencyTypes);
3287
3287
3288
3288
writeGenericParams (theEnum->getGenericParams ());
3289
- writeMembers (id, theEnum->getMembers (), false );
3289
+ writeMembers (id, theEnum->getAllMembers (), false );
3290
3290
S.writeConformances (conformances, S.DeclTypeAbbrCodes );
3291
3291
}
3292
3292
@@ -3345,7 +3345,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
3345
3345
inheritedAndDependencyTypes);
3346
3346
3347
3347
writeGenericParams (theClass->getGenericParams ());
3348
- writeMembers (id, theClass->getMembers (), true );
3348
+ writeMembers (id, theClass->getAllMembers (), true );
3349
3349
S.writeConformances (conformances, S.DeclTypeAbbrCodes );
3350
3350
}
3351
3351
@@ -3394,7 +3394,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
3394
3394
writeGenericParams (proto->getGenericParams ());
3395
3395
S.writeGenericRequirements (
3396
3396
proto->getRequirementSignature (), S.DeclTypeAbbrCodes );
3397
- writeMembers (id, proto->getMembers (), true );
3397
+ writeMembers (id, proto->getAllMembers (), true );
3398
3398
writeDefaultWitnessTable (proto);
3399
3399
}
3400
3400
@@ -5128,7 +5128,7 @@ static void collectInterestingNestedDeclarations(
5128
5128
5129
5129
// Recurse into nested declarations.
5130
5130
if (auto iterable = dyn_cast<IterableDeclContext>(member)) {
5131
- collectInterestingNestedDeclarations (S, iterable->getMembers (),
5131
+ collectInterestingNestedDeclarations (S, iterable->getAllMembers (),
5132
5132
operatorMethodDecls,
5133
5133
objcMethods, nestedTypeDecls,
5134
5134
derivativeConfigs,
@@ -5210,7 +5210,7 @@ void Serializer::writeAST(ModuleOrSourceFile DC) {
5210
5210
if (auto bodyFP = IDC->getBodyFingerprint ()) {
5211
5211
declFingerprints.insert ({addDeclRef (D), *bodyFP});
5212
5212
}
5213
- collectInterestingNestedDeclarations (*this , IDC->getMembers (),
5213
+ collectInterestingNestedDeclarations (*this , IDC->getAllMembers (),
5214
5214
operatorMethodDecls, objcMethods,
5215
5215
nestedTypeDecls,
5216
5216
uniquedDerivativeConfigs);
@@ -5243,7 +5243,7 @@ void Serializer::writeAST(ModuleOrSourceFile DC) {
5243
5243
if (auto bodyFP = IDC->getBodyFingerprint ()) {
5244
5244
declFingerprints.insert ({addDeclRef (TD), *bodyFP});
5245
5245
}
5246
- collectInterestingNestedDeclarations (*this , IDC->getMembers (),
5246
+ collectInterestingNestedDeclarations (*this , IDC->getAllMembers (),
5247
5247
operatorMethodDecls, objcMethods,
5248
5248
nestedTypeDecls,
5249
5249
uniquedDerivativeConfigs,
0 commit comments