Skip to content

Fix toolchain stack equality checks when checking if specialized targets are compatible #615

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
Jun 26, 2025
+54 −2
Merged

Fix toolchain stack equality checks when checking if specialized targets are compatible #615

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
4 changes: 2 additions & 2 deletions Sources/SWBCore/DependencyResolution.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ struct SpecializationParameters: Hashable, CustomStringConvertible {
func isCompatible(with configuredTarget: ConfiguredTarget, settings: Settings, workspaceContext: WorkspaceContext) -> Bool {
let toolchain = effectiveToolchainOverride(originalParameters: configuredTarget.parameters, workspaceContext: workspaceContext)
return (platform == nil || platform === settings.platform) &&
(sdkVariant == nil || sdkVariant?.name == settings.sdkVariant?.name) &&
(toolchain == nil || toolchain == settings.globalScope.evaluate(BuiltinMacros.TOOLCHAINS)) &&
(sdkVariant == nil || sdkVariant?.name == settings.sdkVariant?.name) &&
(toolchain == nil || toolchain == settings.toolchains.map(\.identifier)) &&
(canonicalNameSuffix == nil || canonicalNameSuffix?.nilIfEmpty == settings.sdk?.canonicalNameSuffix)
}

Expand Down
52 changes: 52 additions & 0 deletions Tests/SWBCoreTests/TargetDependencyResolverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,58 @@ fileprivate enum TargetPlatformSpecializationMode {
}
}

@Test
func toolchainOverlaysViaOverridesDoNotConflictWithSpecialization() async throws {
let core = try await getCore()
let workspace = try TestWorkspace("Workspace",
projects: [TestPackageProject("aProject",
groupTree: TestGroup("SomeFiles"),
targets: [
TestAggregateTarget("ALL", dependencies: ["iOSFwk", "PackageLibProduct"]),
TestStandardTarget(
"iOSFwk",
type: .framework,
buildConfigurations: [
TestBuildConfiguration("Debug", buildSettings: ["SDKROOT": "macosx"]),
],
dependencies: ["PackageLibProduct"]
),
TestPackageProductTarget(
"PackageLibProduct",
frameworksBuildPhase: TestFrameworksBuildPhase([
TestBuildFile(.target("PackageLib"))]),
buildConfigurations: [
// Targets need to opt-in to specialization.
TestBuildConfiguration("Debug", buildSettings: [
"SDKROOT": "auto",
"SDK_VARIANT": "auto",
"SUPPORTED_PLATFORMS": "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator",
]),
],
dependencies: ["PackageLib"]
),
TestStandardTarget("PackageLib", type: .staticLibrary),
]
)]
).load(core)
let workspaceContext = WorkspaceContext(core: core, workspace: workspace, processExecutionCache: .sharedForTesting)
let project = workspace.projects[0]

// Configure the targets and create a BuildRequest.
let buildParameters = BuildParameters(configuration: "Debug", activeRunDestination: RunDestinationInfo.macOS, overrides: ["TOOLCHAINS": "com.fake-toolchain-identifier"])
let allTarget = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[0])
let packageTarget = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: project.targets[2])
let buildRequest = BuildRequest(parameters: buildParameters, buildTargets: [allTarget, packageTarget], continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: false, useDryRun: false)
let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)

for type in TargetGraphFactory.GraphType.allCases {
// Get the dependency closure for the build request and examine it.
let delegate = EmptyTargetDependencyResolverDelegate(workspace: workspaceContext.workspace)
_ = await TargetGraphFactory(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext, delegate: delegate).graph(type: type)
delegate.checkNoDiagnostics()
}
}

@Test(.requireSDKs(.macOS))
func macCatalystSpecialization() async throws {
let core = try await getCore()
Expand Down
Loading