@@ -2712,7 +2712,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
2712
2712
// / \param members The decls within the context.
2713
2713
// / \param isClass True if the context could be a class context (class,
2714
2714
// / class extension, or protocol).
2715
- void writeMembers (DeclID parentID, DeclRange members, bool isClass) {
2715
+ void writeMembers (DeclID parentID, ArrayRef<Decl *> members, bool isClass) {
2716
2716
using namespace decls_block ;
2717
2717
2718
2718
SmallVector<DeclID, 16 > memberIDs;
@@ -2853,7 +2853,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
2853
2853
2854
2854
SmallVector<DeclID, 16 > witnessIDs;
2855
2855
2856
- for (auto member : proto->getMembers ()) {
2856
+ for (auto member : proto->getAllMembers ()) {
2857
2857
if (auto *value = dyn_cast<ValueDecl>(member)) {
2858
2858
auto witness = proto->getDefaultWitness (value);
2859
2859
if (!witness)
@@ -3032,7 +3032,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
3032
3032
for (auto *genericParams : llvm::reverse (allGenericParams))
3033
3033
writeGenericParams (genericParams);
3034
3034
3035
- writeMembers (id, extension->getMembers (), isClassExtension);
3035
+ writeMembers (id, extension->getAllMembers (), isClassExtension);
3036
3036
S.writeConformances (conformances, S.DeclTypeAbbrCodes );
3037
3037
}
3038
3038
@@ -3248,7 +3248,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
3248
3248
3249
3249
3250
3250
writeGenericParams (theStruct->getGenericParams ());
3251
- writeMembers (id, theStruct->getMembers (), false );
3251
+ writeMembers (id, theStruct->getAllMembers (), false );
3252
3252
S.writeConformances (conformances, S.DeclTypeAbbrCodes );
3253
3253
}
3254
3254
@@ -3305,7 +3305,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
3305
3305
inheritedAndDependencyTypes);
3306
3306
3307
3307
writeGenericParams (theEnum->getGenericParams ());
3308
- writeMembers (id, theEnum->getMembers (), false );
3308
+ writeMembers (id, theEnum->getAllMembers (), false );
3309
3309
S.writeConformances (conformances, S.DeclTypeAbbrCodes );
3310
3310
}
3311
3311
@@ -3364,7 +3364,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
3364
3364
inheritedAndDependencyTypes);
3365
3365
3366
3366
writeGenericParams (theClass->getGenericParams ());
3367
- writeMembers (id, theClass->getMembers (), true );
3367
+ writeMembers (id, theClass->getAllMembers (), true );
3368
3368
S.writeConformances (conformances, S.DeclTypeAbbrCodes );
3369
3369
}
3370
3370
@@ -3413,7 +3413,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
3413
3413
writeGenericParams (proto->getGenericParams ());
3414
3414
S.writeGenericRequirements (
3415
3415
proto->getRequirementSignature (), S.DeclTypeAbbrCodes );
3416
- writeMembers (id, proto->getMembers (), true );
3416
+ writeMembers (id, proto->getAllMembers (), true );
3417
3417
writeDefaultWitnessTable (proto);
3418
3418
}
3419
3419
@@ -5149,7 +5149,7 @@ static void collectInterestingNestedDeclarations(
5149
5149
5150
5150
// Recurse into nested declarations.
5151
5151
if (auto iterable = dyn_cast<IterableDeclContext>(member)) {
5152
- collectInterestingNestedDeclarations (S, iterable->getMembers (),
5152
+ collectInterestingNestedDeclarations (S, iterable->getAllMembers (),
5153
5153
operatorMethodDecls,
5154
5154
objcMethods, nestedTypeDecls,
5155
5155
derivativeConfigs,
@@ -5231,7 +5231,7 @@ void Serializer::writeAST(ModuleOrSourceFile DC) {
5231
5231
if (auto bodyFP = IDC->getBodyFingerprint ()) {
5232
5232
declFingerprints.insert ({addDeclRef (D), *bodyFP});
5233
5233
}
5234
- collectInterestingNestedDeclarations (*this , IDC->getMembers (),
5234
+ collectInterestingNestedDeclarations (*this , IDC->getAllMembers (),
5235
5235
operatorMethodDecls, objcMethods,
5236
5236
nestedTypeDecls,
5237
5237
uniquedDerivativeConfigs);
@@ -5264,7 +5264,7 @@ void Serializer::writeAST(ModuleOrSourceFile DC) {
5264
5264
if (auto bodyFP = IDC->getBodyFingerprint ()) {
5265
5265
declFingerprints.insert ({addDeclRef (TD), *bodyFP});
5266
5266
}
5267
- collectInterestingNestedDeclarations (*this , IDC->getMembers (),
5267
+ collectInterestingNestedDeclarations (*this , IDC->getAllMembers (),
5268
5268
operatorMethodDecls, objcMethods,
5269
5269
nestedTypeDecls,
5270
5270
uniquedDerivativeConfigs,
0 commit comments