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 branch 'main' into elsh/pkg-sil-verify

Browse Source
This commit is contained in:
Ellie Shin
2024-04-17 22:46:55 -07:00
committed by GitHub
parent fbb3382e21 2a9a78004c
commit 45e8454a9e
604 changed files with 9702 additions and 3715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -431,7 +431,8 @@ SerializedModuleLoaderBase::getImportsOfModule(
llvm::ErrorOr<ModuleDependencyInfo>
SerializedModuleLoaderBase::scanModuleFile(Twine modulePath, bool isFramework,
bool isTestableImport) {
bool isTestableImport,
bool hasInterface) {
const std::string moduleDocPath;
const std::string sourceInfoPath;
@@ -455,7 +456,10 @@ SerializedModuleLoaderBase::scanModuleFile(Twine modulePath, bool isFramework,
return std::make_error_code(std::errc::no_such_file_or_directory);
}
if (loadedModuleFile->isTestable() && !isTestableImport) {
// If the module file has interface file and not testable imported, don't
// import the testable module because it contains more interfaces than
// needed and can pull in more dependencies.
if (loadedModuleFile->isTestable() && !isTestableImport && hasInterface) {
if (Ctx.LangOpts.EnableModuleLoadingRemarks)
Ctx.Diags.diagnose(SourceLoc(), diag::skip_module_testable,
modulePath.str());
@@ -852,6 +856,8 @@ getOSAndVersionForDiagnostics(const llvm::Triple &triple) {
osName = swift::prettyPlatformString(PlatformKind::tvOS);
} else if (triple.isiOS()) {
osName = swift::prettyPlatformString(PlatformKind::iOS);
} else if (triple.isXROS()) {
osName = swift::prettyPlatformString(PlatformKind::visionOS);
} else {
assert(!triple.isOSDarwin() && "unknown Apple OS");
// Fallback to the LLVM triple name. This isn't great (it won't be