Skip to content

[Explain Dependency] Fix 'testTraceDependency' to account for Swift Overlay dependencies being separate from direct import dependencies. #1417

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
Aug 17, 2023
Merged

[Explain Dependency] Fix 'testTraceDependency' to account for Swift Overlay dependencies being separate from direct import dependencies. #1417

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
9 changes: 5 additions & 4 deletions ...SwiftDriver/ExplicitModuleBuilds/InterModuleDependencies/CommonDependencyOperations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,13 @@ internal extension InterModuleDependencyGraph {
return
}

// If no more dependencies, this is a leaf node, we are done
guard let dependencies = sourceInfo.directDependencies else {
return
var allDependencies = sourceInfo.directDependencies ?? []
if case .swift(let swiftModuleDetails) = sourceInfo.details,
let overlayDependencies = swiftModuleDetails.swiftOverlayDependencies {
allDependencies.append(contentsOf: overlayDependencies)
}

for dependency in dependencies {
for dependency in allDependencies {
try findAllPaths(source: dependency,
to: moduleName,
pathSoFar: pathSoFar + [dependency],
Expand Down