Skip to content

Don't expect module deps if Swift explicit modules are turned off #846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2025
+64 −47
Merged

Don't expect module deps if Swift explicit modules are turned off #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2311,7 +2311,7 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
}

let dependencyValidationPayload: SwiftDependencyValidationPayload?
if let context = cbc.producer.moduleDependenciesContext, let outputPath = objectOutputPaths.first, context.validate != .no {
if explicitModuleBuildEnabled, let context = cbc.producer.moduleDependenciesContext, let outputPath = objectOutputPaths.first, context.validate != .no {
let primarySwiftBaseName = cbc.scope.evaluate(BuiltinMacros.TARGET_NAME) + compilationMode.moduleBaseNameSuffix + "-primary"
let dependencyValidationOutputPath = outputPath.dirname.join(primarySwiftBaseName + ".dependencies")
extraOutputPaths.append(dependencyValidationOutputPath)
Expand Down
109 changes: 63 additions & 46 deletions Tests/SWBBuildSystemTests/DependencyValidationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,7 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
}
}

@Test(.requireSDKs(.host), .skipHostOS(.windows, "toolchain too old"), .skipHostOS(.linux, "toolchain too old"))
func validateModuleDependenciesSwift() async throws {
func validateModuleDependenciesSwift(explicitModules: Bool) async throws {
try await withTemporaryDirectory { tmpDir in
let testWorkspace = try await TestWorkspace(
"Test",
Expand All @@ -366,8 +365,8 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
buildSettings: [
"PRODUCT_NAME": "$(TARGET_NAME)",
"CLANG_ENABLE_MODULES": "YES",
"CLANG_ENABLE_EXPLICIT_MODULES": "YES",
"SWIFT_ENABLE_EXPLICIT_MODULES": "YES",
"CLANG_ENABLE_EXPLICIT_MODULES": explicitModules ? "YES" : "NO",
"SWIFT_ENABLE_EXPLICIT_MODULES": explicitModules ? "YES" : "NO",
"SWIFT_UPCOMING_FEATURE_INTERNAL_IMPORTS_BY_DEFAULT": "YES",
"SWIFT_VERSION": swiftVersion,
"DEFINES_MODULE": "YES",
Expand Down Expand Up @@ -418,50 +417,58 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
let projectXCConfigFinalLineNumber = projectXCConfigLines.count
let projectXCConfigFinalColumnNumber = (projectXCConfigLines.last?.count ?? 0) + 1

let expectedDiagsByTarget: [String: [Diagnostic]] = [
"TargetA": [
Diagnostic(
behavior: .error,
location: Diagnostic.Location.path(projectXCConfigPath, line: 1, column: 47),
data: DiagnosticData("Missing entries in MODULE_DEPENDENCIES: Foundation"),
fixIts: [
Diagnostic.FixIt(
sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: 1, startColumn: 47, endLine: 1, endColumn: 47),
newText: " \\\n Foundation"),
],
childDiagnostics: [
Diagnostic(
behavior: .error,
location: Diagnostic.Location.path(swiftSourcePath, line: 1, column: 8),
data: DiagnosticData("Missing entry in MODULE_DEPENDENCIES: Foundation"),
fixIts: [Diagnostic.FixIt(
let expectedDiagsByTarget: [String: [Diagnostic]]
if explicitModules {
expectedDiagsByTarget = [
"TargetA": [
Diagnostic(
behavior: .error,
location: Diagnostic.Location.path(projectXCConfigPath, line: 1, column: 47),
data: DiagnosticData("Missing entries in MODULE_DEPENDENCIES: Foundation"),
fixIts: [
Diagnostic.FixIt(
sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: 1, startColumn: 47, endLine: 1, endColumn: 47),
newText: " \\\n Foundation")],
),
]),
],
"TargetB": [
Diagnostic(
behavior: .error,
location: Diagnostic.Location.path(projectXCConfigPath, line: projectXCConfigFinalLineNumber, column: projectXCConfigFinalColumnNumber),
data: DiagnosticData("Missing entries in MODULE_DEPENDENCIES: Foundation"),
fixIts: [
Diagnostic.FixIt(
sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: projectXCConfigFinalLineNumber, startColumn: projectXCConfigFinalColumnNumber, endLine: projectXCConfigFinalLineNumber, endColumn: projectXCConfigFinalColumnNumber),
newText: "\nMODULE_DEPENDENCIES[target=TargetB] = $(inherited) \\\n Foundation\n"),
],
childDiagnostics: [
Diagnostic(
behavior: .error,
location: Diagnostic.Location.path(swiftSourcePath, line: 1, column: 8),
data: DiagnosticData("Missing entry in MODULE_DEPENDENCIES: Foundation"),
fixIts: [Diagnostic.FixIt(
newText: " \\\n Foundation"),
],
childDiagnostics: [
Diagnostic(
behavior: .error,
location: Diagnostic.Location.path(swiftSourcePath, line: 1, column: 8),
data: DiagnosticData("Missing entry in MODULE_DEPENDENCIES: Foundation"),
fixIts: [Diagnostic.FixIt(
sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: 1, startColumn: 47, endLine: 1, endColumn: 47),
newText: " \\\n Foundation")],
),
]),
],
"TargetB": [
Diagnostic(
behavior: .error,
location: Diagnostic.Location.path(projectXCConfigPath, line: projectXCConfigFinalLineNumber, column: projectXCConfigFinalColumnNumber),
data: DiagnosticData("Missing entries in MODULE_DEPENDENCIES: Foundation"),
fixIts: [
Diagnostic.FixIt(
sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: projectXCConfigFinalLineNumber, startColumn: projectXCConfigFinalColumnNumber, endLine: projectXCConfigFinalLineNumber, endColumn: projectXCConfigFinalColumnNumber),
newText: "\nMODULE_DEPENDENCIES[target=TargetB] = $(inherited) \\\n Foundation\n")],
),
]),
],
]
newText: "\nMODULE_DEPENDENCIES[target=TargetB] = $(inherited) \\\n Foundation\n"),
],
childDiagnostics: [
Diagnostic(
behavior: .error,
location: Diagnostic.Location.path(swiftSourcePath, line: 1, column: 8),
data: DiagnosticData("Missing entry in MODULE_DEPENDENCIES: Foundation"),
fixIts: [Diagnostic.FixIt(
sourceRange: Diagnostic.SourceRange(path: projectXCConfigPath, startLine: projectXCConfigFinalLineNumber, startColumn: projectXCConfigFinalColumnNumber, endLine: projectXCConfigFinalLineNumber, endColumn: projectXCConfigFinalColumnNumber),
newText: "\nMODULE_DEPENDENCIES[target=TargetB] = $(inherited) \\\n Foundation\n")],
),
]),
],
]
} else {
expectedDiagsByTarget = [
"TargetA": [],
"TargetB": [],
]
}

for (targetName, expectedDiags) in expectedDiagsByTarget {
let target = try #require(tester.workspace.projects.only?.targets.first { $0.name == targetName })
Expand All @@ -482,6 +489,16 @@ fileprivate struct DependencyValidationTests: CoreBasedTests {
}
}

@Test(.requireSDKs(.host), .skipHostOS(.windows, "toolchain too old"), .skipHostOS(.linux, "toolchain too old"))
func validateModuleDependenciesSwift() async throws {
try await validateModuleDependenciesSwift(explicitModules: true)
}

@Test(.requireSDKs(.host), .skipHostOS(.windows, "toolchain too old"), .skipHostOS(.linux, "toolchain too old"))
func validateModuleDependenciesSwiftExplicitModulesOff() async throws {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it possible to parameterize this using @test?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

try await validateModuleDependenciesSwift(explicitModules: false)
}

@Test(.requireSDKs(.host), .requireClangFeatures(.printHeadersDirectPerFile))
func validateModuleDependenciesClang() async throws {
try await withTemporaryDirectory { tmpDir async throws -> Void in
Expand Down