@@ -189,7 +189,7 @@ PrintOptions PrintOptions::printSwiftInterfaceFile(ModuleDecl *ModuleToPrint,
189
189
localModule->isImportedImplementationOnly (nominalModule)) {
190
190
191
191
bool shouldPrintMembers = llvm::any_of (
192
- ED->getMembers (),
192
+ ED->getAllMembers (),
193
193
[&](const Decl *member) -> bool {
194
194
return shouldPrint (member, options);
195
195
});
@@ -1750,7 +1750,7 @@ bool ShouldPrintChecker::shouldPrint(const Decl *D,
1750
1750
getInheritedForPrinting (Ext, Options, ProtocolsToPrint);
1751
1751
if (ProtocolsToPrint.empty ()) {
1752
1752
bool HasMemberToPrint = false ;
1753
- for (auto Member : Ext->getMembers ()) {
1753
+ for (auto Member : Ext->getAllMembers ()) {
1754
1754
if (shouldPrint (Member, Options)) {
1755
1755
HasMemberToPrint = true ;
1756
1756
break ;
@@ -2050,24 +2050,24 @@ void PrintAST::printMembersOfDecl(Decl *D, bool needComma,
2050
2050
bool openBracket,
2051
2051
bool closeBracket) {
2052
2052
llvm::SmallVector<Decl *, 3 > Members;
2053
- auto AddDeclFunc = [&](DeclRange Range) {
2053
+ auto AddDeclFunc = [&](ArrayRef<Decl *> Range) {
2054
2054
for (auto RD : Range)
2055
2055
Members.push_back (RD);
2056
2056
};
2057
2057
2058
2058
if (auto Ext = dyn_cast<ExtensionDecl>(D)) {
2059
- AddDeclFunc (Ext->getMembers ());
2059
+ AddDeclFunc (Ext->getAllMembers ());
2060
2060
} else if (auto NTD = dyn_cast<NominalTypeDecl>(D)) {
2061
- AddDeclFunc (NTD->getMembers ());
2061
+ AddDeclFunc (NTD->getAllMembers ());
2062
2062
for (auto Ext : NTD->getExtensions ()) {
2063
2063
if (Options.printExtensionContentAsMembers (Ext))
2064
- AddDeclFunc (Ext->getMembers ());
2064
+ AddDeclFunc (Ext->getAllMembers ());
2065
2065
}
2066
2066
if (Options.PrintExtensionFromConformingProtocols ) {
2067
2067
for (auto Conf : NTD->getAllConformances ()) {
2068
2068
for (auto Ext : Conf->getProtocol ()->getExtensions ()) {
2069
2069
if (Options.printExtensionContentAsMembers (Ext))
2070
- AddDeclFunc (Ext->getMembers ());
2070
+ AddDeclFunc (Ext->getAllMembers ());
2071
2071
}
2072
2072
}
2073
2073
}
0 commit comments