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

Frontend: Upstream blocklist check in ignoring adjacent swiftmodule files

Browse Source
This commit is contained in:
Alexis Laferrière
2025-03-18 11:48:15 -07:00
parent 2f30161563
commit 7d3ed787a1
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -836,12 +836,20 @@ class ModuleInterfaceLoaderImpl {
// Don't use the adjacent swiftmodule for frameworks from the public
// Frameworks folder of the SDK.
if (isInSystemFrameworks(modulePath, /*publicFramework*/true) ||
isInSystemSubFrameworks(modulePath)) {
bool blocklistSwiftmodule =
ctx.blockListConfig.hasBlockListAction(moduleName,
BlockListKeyKind::ModuleName,
BlockListAction::ShouldUseBinaryModule);
if ((isInSystemFrameworks(modulePath, /*publicFramework*/true) ||
isInSystemSubFrameworks(modulePath)) &&
!blocklistSwiftmodule) {
shouldLoadAdjacentModule = false;
rebuildInfo.addIgnoredModule(modulePath,
ReasonIgnored::PublicFramework);
} else if (isInSystemLibraries(modulePath) && moduleName != STDLIB_NAME) {
} else if (isInSystemLibraries(modulePath) &&
moduleName != STDLIB_NAME &&
!blocklistSwiftmodule) {
shouldLoadAdjacentModule = false;
rebuildInfo.addIgnoredModule(modulePath,
ReasonIgnored::PublicLibrary);