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

[AST] Treat platform modules as non-user

Browse Source 
Modules defined within the SDK are considered
non-user modules, extend this to any module found
within the parent platform directory if there is
one. This ensures we include modules such as
XCTest and Testing.

rdar://131854240
This commit is contained in:
Hamish Knight
2024-08-23 14:23:37 +01:00
parent 7075c05d62
commit 940f5f7c2a
6 changed files with 70 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/AST/Module.cpp
View File

@@ -4009,7 +4009,8 @@ FrontendStatsTracer::getTraceFormatter<const SourceFile *>() {
bool IsNonUserModuleRequest::evaluate(Evaluator &evaluator, ModuleDecl *mod) const {
// If there's no SDK path, fallback to checking whether the module was
// in the system search path or a clang system module
SearchPathOptions &searchPathOpts = mod->getASTContext().SearchPathOpts;
auto &ctx = mod->getASTContext();
SearchPathOptions &searchPathOpts = ctx.SearchPathOpts;
StringRef sdkPath = searchPathOpts.getSDKPath();
if (sdkPath.empty() && mod->isSystemModule())
return true;
@@ -4028,9 +4029,14 @@ bool IsNonUserModuleRequest::evaluate(Evaluator &evaluator, ModuleDecl *mod) con
if (modulePath.empty())
return false;
// If we have a platform path, check against that as it will be a parent of
// the SDK path.
auto *FS = ctx.SourceMgr.getFileSystem().get();
auto sdkOrPlatform = searchPathOpts.getSDKPlatformPath(FS).value_or(sdkPath);
StringRef runtimePath = searchPathOpts.RuntimeResourcePath;
return (!runtimePath.empty() && pathStartsWith(runtimePath, modulePath)) ||
(!sdkPath.empty() && pathStartsWith(sdkPath, modulePath));
(!sdkOrPlatform.empty() && pathStartsWith(sdkOrPlatform, modulePath));
}
version::Version ModuleDecl::getLanguageVersionBuiltWith() const {