averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70566 from xymus/spi-reexport-swift-only

Browse Source 
Sema: Reexport SPI via Swift exported imports but not clang's
This commit is contained in:
Alexis Laferrière
2024-01-03 09:33:34 -08:00
committed by GitHub
parent e431716e93 8b91e4ca17
commit 91c62de72d
7 changed files with 160 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/AST/Module.cpp
View File

@@ -2716,14 +2716,6 @@ const clang::Module *ModuleDecl::findUnderlyingClangModule() const {
return nullptr;
}
bool ModuleDecl::isExportedAs(const ModuleDecl *other) const {
auto clangModule = findUnderlyingClangModule();
if (!clangModule)
return false;
return other->getRealName().str() == clangModule->ExportAsModule;
}
void ModuleDecl::collectBasicSourceFileInfo(
llvm::function_ref<void(const BasicSourceFileInfo &)> callback) const {
for (const FileUnit *fileUnit : getFiles()) {
@@ -3519,8 +3511,8 @@ void SourceFile::lookupImportedSPIGroups(
for (auto &import : *Imports) {
if (import.options.contains(ImportFlags::SPIAccessControl) &&
(importedModule == import.module.importedModule ||
(imports.isImportedBy(importedModule, import.module.importedModule) &&
importedModule->isExportedAs(import.module.importedModule)))) {
imports.isImportedByViaSwiftOnly(importedModule,
import.module.importedModule))) {
spiGroups.insert(import.spiGroups.begin(), import.spiGroups.end());
}
}