Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift_jenkins
2020-06-01 11:55:33 -07:00
13 changed files with 50 additions and 43 deletions

View File

@@ -2663,13 +2663,14 @@ void ModuleFile::lookupObjCMethods(
}
}
void ModuleFile::lookupImportedSPIGroups(const ModuleDecl *importedModule,
SmallVectorImpl<Identifier> &spiGroups) const {
void ModuleFile::lookupImportedSPIGroups(
const ModuleDecl *importedModule,
llvm::SmallSetVector<Identifier, 4> &spiGroups) const {
for (auto &dep : Dependencies) {
auto depSpis = dep.spiGroups;
if (dep.Import.hasValue() && dep.Import->importedModule == importedModule &&
!depSpis.empty()) {
spiGroups.append(depSpis.begin(), depSpis.end());
spiGroups.insert(depSpis.begin(), depSpis.end());
}
}
}