Skip to content

Store the correct package name in PackagePIFBuilder.LinkedPackageBinary metadata #9436

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

Open
pmattos wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Store the correct package name in PackagePIFBuilder.LinkedPackageBinary metadata #9436

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
31 changes: 18 additions & 13 deletions Sources/SwiftBuildSupport/PackagePIFBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import class PackageModel.Product
import struct PackageModel.Platform
import struct PackageModel.PlatformVersion
import struct PackageModel.Resource
import struct PackageModel.PackageIdentity
import enum PackageModel.ProductType

import struct PackageGraph.ModulesGraph
Expand Down Expand Up @@ -347,19 +348,25 @@ public final class PackagePIFBuilder {

public struct LinkedPackageBinary {
public let name: String
public let packageName: String
public let type: BinaryType
public let packageIdentity: PackageIdentity

@frozen
public enum BinaryType {
case product
case target
}

public init(name: String, packageName: String, type: BinaryType) {
self.name = name
self.packageName = packageName
self.type = type
public init(product: String, packageIdentity: PackageIdentity) {
self.name = product
self.type = .product
self.packageIdentity = packageIdentity
}

public init(module: String, packageIdentity: PackageIdentity) {
self.name = module
self.type = .target
self.packageIdentity = packageIdentity
}
}

Expand Down Expand Up @@ -695,29 +702,27 @@ enum PIFBuildingError: Error {
}

extension PackagePIFBuilder.LinkedPackageBinary {
init?(module: ResolvedModule, package: ResolvedPackage) {
let packageName = package.manifest.displayName

init?(module: ResolvedModule) {
switch module.type {
case .executable, .snippet, .test:
self.init(name: module.name, packageName: packageName, type: .product)
self.init(product: module.name, packageIdentity: module.packageIdentity)

case .library, .binary, .macro:
self.init(name: module.name, packageName: packageName, type: .target)
self.init(module: module.name, packageIdentity: module.packageIdentity)

case .systemModule, .plugin:
return nil
}
}

init?(dependency: ResolvedModule.Dependency, package: ResolvedPackage) {
init?(dependency: ResolvedModule.Dependency) {
Copy link
Contributor Author

@pmattos pmattos Dec 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This was the root cause: Note how we wrongly forward the client package name (i.e., package.name) to PackagePIFBuilder.LinkedPackageBinary, binding it to the incorrect package.

switch dependency {
case .product(let productDependency, _):
guard productDependency.hasSourceTargets else { return nil }
self.init(name: productDependency.name, packageName: package.name, type: .product)
self.init(product: productDependency.name, packageIdentity: productDependency.packageIdentity)

case .module(let moduleDependency, _):
self.init(module: moduleDependency, package: package)
self.init(module: moduleDependency)
}
}
}
2 changes: 1 addition & 1 deletion Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ extension PackagePIFProjectBuilder {

// Collect linked binaries.
let linkedPackageBinaries: [PackagePIFBuilder.LinkedPackageBinary] = sourceModule.dependencies.compactMap {
PackagePIFBuilder.LinkedPackageBinary(dependency: $0, package: self.package)
PackagePIFBuilder.LinkedPackageBinary(dependency: $0)
}

let productOrModuleType: PackagePIFBuilder.ModuleOrProductType = if desiredModuleType == .dynamicLibrary {
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Products.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ extension PackagePIFProjectBuilder {

// Collect linked binaries.
let linkedPackageBinaries: [PackagePIFBuilder.LinkedPackageBinary] = mainModule.dependencies.compactMap {
PackagePIFBuilder.LinkedPackageBinary(dependency: $0, package: self.package)
PackagePIFBuilder.LinkedPackageBinary(dependency: $0)
}

let moduleOrProduct = PackagePIFBuilder.ModuleOrProduct(
Expand Down Expand Up @@ -844,7 +844,7 @@ extension PackagePIFProjectBuilder {

// Collect linked binaries.
let linkedPackageBinaries = product.modules.compactMap {
PackagePIFBuilder.LinkedPackageBinary(module: $0, package: self.package)
PackagePIFBuilder.LinkedPackageBinary(module: $0)
}

let moduleOrProductType: PackagePIFBuilder.ModuleOrProductType = switch product.libraryType {
Expand Down