Skip to content

Commit 4d6eb70

Browse files
committed
[Dependency Scanning] Revert: Remove Swift Overlay dependencies from the set of direct dependencies
Functionally reverts #67928. We must still support potentially older drivers which are not ready for this change due to: swiftlang/swift-driver#1438
1 parent 4002cc8 commit 4d6eb70

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

lib/DependencyScan/ScanDependencies.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,10 @@ resolveDependencies(CompilerInstance &instance, ModuleDependencyID moduleID,
627627
ctx.getSwiftModuleDependencies(clangDep, cache, ASTDelegate)) {
628628
if (clangDep != moduleID.first) {
629629
swiftOverlayDependencies.insert({clangDep, found.value()->getKind()});
630+
// FIXME: Once all clients know to fetch these dependencies from
631+
// `swiftOverlayDependencies`, the goal is to no longer have them in
632+
// `directDependencies` so the following will need to go away.
633+
directDependencies.insert({clangDep, found.value()->getKind()});
630634
}
631635
}
632636
}

0 commit comments

Comments
 (0)