averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Dependency Scanning] Resolve cross-import overlays relative to defining interface for prebuilt binary Swift dependencies

Browse Source 
When the dependency scanner picks a pre-built binary module candidate for a given dependency, it needs to be able to attempt to resolve its cross-import overlays relative to the textual interface that the binary module was built from. For example, if a collection of binary modules are located in, and resolved as dependencies from, a pre-built module directory, the scanner must lookup their corresponding cross-import overlays relative to the defining interface as read out from the binary module's MODULE_INTERFACE_PATH. https://github.com/swiftlang/swift/pull/70817 ensures that binary modules serialize the path to their defining textual interface.

Resolves rdar://130778577
This commit is contained in:
Artem Chikin
2024-07-02 15:50:55 -07:00
committed by artemcm
parent 1fde4c1267
commit 2464f87f8f
9 changed files with 134 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/AST/ModuleLoader.cpp
View File

@@ -223,7 +223,7 @@ ModuleDependencyInfo::collectCrossImportOverlayNames(
}
case swift::ModuleDependencyKind::SwiftBinary: {
auto *swiftBinaryDep = getAsSwiftBinaryModule();
modulePath = swiftBinaryDep->compiledModulePath;
modulePath = swiftBinaryDep->getDefiningModulePath();
assert(modulePath.has_value());
StringRef parentDir = llvm::sys::path::parent_path(*modulePath);
if (llvm::sys::path::extension(parentDir) == ".swiftmodule") {