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 #65337 from xymus/spi-only-dep

Browse Source 
[Serialization] Write down SPI only dependencies as required in swiftmodules
This commit is contained in:
Alexis Laferrière
2023-04-20 22:00:37 -07:00
committed by GitHub
parent 91ec64d3b1 6be76a503f
commit e8a5fa4f67
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Serialization/Serialization.cpp
View File

@@ -1219,8 +1219,9 @@ void Serializer::writeInputBlock(const SerializationOptions &options) {
// distinguish them.
ImportSet publicImportSet =
getImportsAsSet(M, ModuleDecl::ImportFilterKind::Exported);
ImportSet privateImportSet =
getImportsAsSet(M, ModuleDecl::ImportFilterKind::Default);
ImportSet defaultImportSet =
getImportsAsSet(M, {ModuleDecl::ImportFilterKind::Default,
ModuleDecl::ImportFilterKind::SPIOnly});
ImportSet packageOnlyImportSet =
getImportsAsSet(M, ModuleDecl::ImportFilterKind::PackageOnly);
ImportSet internalOrBelowImportSet =
@@ -1270,7 +1271,7 @@ void Serializer::writeInputBlock(const SerializationOptions &options) {
// form here.
if (publicImportSet.count(import))
stableImportControl = ImportControl::Exported;
else if (privateImportSet.count(import))
else if (defaultImportSet.count(import))
stableImportControl = ImportControl::Normal;
else if (packageOnlyImportSet.count(import))
stableImportControl = ImportControl::PackageOnly;

40
test/Serialization/spi-only-dependency.swift Normal file
View File

@@ -0,0 +1,40 @@
// RUN: %empty-directory(%t)
// RUN: split-file %s %t
//--- SPIDependency.swift
// RUN: %target-swift-frontend -emit-module %t/SPIDependency.swift -o %t \
// RUN: -enable-library-evolution -swift-version 5
//--- Lib.swift
// RUN: %target-swift-frontend -emit-module %t/Lib.swift -o %t -I %t \
// RUN: -enable-library-evolution -swift-version 5 \
// RUN: -emit-module-path %t/Lib.swiftmodule \
// RUN: -emit-module-interface-path %t/Lib.swiftinterface \
// RUN: -emit-private-module-interface-path %t/Lib.private.swiftinterface \
// RUN: -experimental-spi-only-imports
@_spiOnly import SPIDependency
//--- Client.swift
/// SPIDependency is visible when using the swiftmodule or private interface.
// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
// RUN: -experimental-spi-only-imports \
// RUN: -Rmodule-loading 2>&1 | %FileCheck -check-prefix=VISIBLE-DEP %s
// VISIBLE-DEP: loaded module 'SPIDependency'
// RUN: rm %t/Lib.swiftmodule
// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
// RUN: -experimental-spi-only-imports \
// RUN: -Rmodule-loading 2>&1 | %FileCheck -check-prefix=VISIBLE-DEP %s
/// SPIDependency is not visible when using the public swiftinterface.
// RUN: rm %t/Lib.private.swiftinterface
// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
// RUN: -experimental-spi-only-imports \
// RUN: -Rmodule-loading 2>&1 | %FileCheck -check-prefix=VISIBLE-DEP-NOT %s
// VISIBLE-DEP-NOT-NOT: loaded module 'SPIDependency'
import Lib