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

@@ -1177,8 +1177,9 @@ void SerializedASTFile::lookupObjCMethods(
File.lookupObjCMethods(selector, results);
}
void SerializedASTFile::lookupImportedSPIGroups(const ModuleDecl *importedModule,
SmallVectorImpl<Identifier> &spiGroups) const {
void SerializedASTFile::lookupImportedSPIGroups(
const ModuleDecl *importedModule,
llvm::SmallSetVector<Identifier, 4> &spiGroups) const {
File.lookupImportedSPIGroups(importedModule, spiGroups);
}