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

Add new dependency kind (swiftExternal) to model external dependencies.

Browse Source
This commit is contained in:
Artem Chikin
2020-07-20 17:07:47 -07:00
parent c52982c9de
commit b5af62f93f
6 changed files with 153 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/AST/ModuleLoader.cpp
View File

@@ -165,6 +165,8 @@ ModuleDependencies::collectCrossImportOverlayNames(ASTContext &ctx,
using namespace llvm::sys;
using namespace file_types;
Optional<std::string> modulePath;
// A map from secondary module name to a vector of overlay names.
llvm::StringMap<llvm::SmallSetVector<Identifier, 4>> result;
// Mimic getModuleDefiningPath() for Swift and Clang module.
if (auto *swiftDep = dyn_cast<SwiftModuleDependenciesStorage>(storage.get())) {
// Prefer interface path to binary module path if we have it.
@@ -176,12 +178,12 @@ ModuleDependencies::collectCrossImportOverlayNames(ASTContext &ctx,
if (llvm::sys::path::extension(parentDir) == ".swiftmodule") {
modulePath = parentDir.str();
}
} else {
modulePath = cast<ClangModuleDependenciesStorage>(storage.get())->moduleMapFile;
} else if (auto *clangDep = dyn_cast<ClangModuleDependenciesStorage>(storage.get())){
modulePath = clangDep->moduleMapFile;
assert(modulePath.hasValue());
} else { // ExternalSwiftModuleDependency
return result;
}
// A map from secondary module name to a vector of overlay names.
llvm::StringMap<llvm::SmallSetVector<Identifier, 4>> result;
findOverlayFilesInternal(ctx, *modulePath, moduleName, SourceLoc(),
[&](StringRef file) {
StringRef bystandingModule;