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

Merge pull request #79588 from xymus/ignore-more-swiftmodules

Browse Source 
Frontend: Ignore resilient binary swiftmodules under usr/lib/swift
This commit is contained in:
Alexis Laferrière
2025-02-25 09:08:36 -08:00
committed by GitHub
parent 468371fe55 f6ef819ecf
commit c539f7e11a
6 changed files with 96 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -237,6 +237,7 @@ struct ModuleRebuildInfo {
enum class ReasonIgnored {
NotIgnored,
PublicFramework,
PublicLibrary,
InterfacePreferred,
CompilerHostModule,
Blocklisted,
@@ -762,6 +763,28 @@ class ModuleInterfaceLoaderImpl {
return pathStartsWith(frameworksPath, path);
}
bool isInSystemSubFrameworks(StringRef path) {
StringRef sdkPath = ctx.SearchPathOpts.getSDKPath();
if (sdkPath.empty()) return false;
SmallString<128> frameworksPath;
llvm::sys::path::append(frameworksPath,
sdkPath, "System", "Library", "SubFrameworks");
return pathStartsWith(frameworksPath, path);
}
bool isInSystemLibraries(StringRef path) {
StringRef sdkPath = ctx.SearchPathOpts.getSDKPath();
if (sdkPath.empty()) return false;
SmallString<128> frameworksPath;
llvm::sys::path::append(frameworksPath,
sdkPath, "usr", "lib", "swift");
return pathStartsWith(frameworksPath, path);
}
std::pair<std::string, std::string> getCompiledModuleCandidates() {
using ReasonIgnored = ModuleRebuildInfo::ReasonIgnored;
using ReasonModuleInterfaceIgnored =
@@ -813,10 +836,15 @@ class ModuleInterfaceLoaderImpl {
// Don't use the adjacent swiftmodule for frameworks from the public
// Frameworks folder of the SDK.
if (isInSystemFrameworks(modulePath, /*publicFramework*/true)) {
if (isInSystemFrameworks(modulePath, /*publicFramework*/true) ||
isInSystemSubFrameworks(modulePath)) {
shouldLoadAdjacentModule = false;
rebuildInfo.addIgnoredModule(modulePath,
ReasonIgnored::PublicFramework);
} else if (isInSystemLibraries(modulePath) && moduleName != STDLIB_NAME) {
shouldLoadAdjacentModule = false;
rebuildInfo.addIgnoredModule(modulePath,
ReasonIgnored::PublicLibrary);
} else if (isInResourceHostDir(modulePath)) {
shouldLoadAdjacentModule = false;
rebuildInfo.addIgnoredModule(modulePath,