Merge branch 'main' into rebranch

# Conflicts:
#	lib/SILOptimizer/Differentiation/Common.cpp
This commit is contained in:
Becca Royal-Gordon
2023-08-04 15:09:50 -07:00
89 changed files with 1925 additions and 1056 deletions

View File

@@ -3419,6 +3419,9 @@ bool SourceFile::isImportedAsSPI(const ValueDecl *targetDecl) const {
if (shouldImplicitImportAsSPI(targetDecl->getSPIGroups()))
return true;
if (hasTestableOrPrivateImport(AccessLevel::Public, targetDecl, PrivateOnly))
return true;
lookupImportedSPIGroups(targetModule, importedSPIGroups);
if (importedSPIGroups.empty())
return false;