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 an external module dependency test

Browse Source
This commit is contained in:
Artem Chikin
2020-07-21 10:31:57 -07:00
parent b5af62f93f
commit b85f547b13
5 changed files with 156 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Serialization/ModuleDependencyScanner.cpp
View File

@@ -98,13 +98,13 @@ public:
/// set of modules constitute external dependencies that are not visible to the
/// scanner but will nevertheless be provided by the scanner's clients.
/// This "loader" will not attempt to load any module files.
class ExternalSwiftModuleStubLoader : public ModuleDependencyScanner {
class ExternalSwiftModuleStubScanner : public ModuleDependencyScanner {
/// Scan the given external module map
void parseExternalModuleMap(StringRef fileName);
llvm::StringMap<ExplicitModuleInfo> ExternalDependencyModuleMap;
public:
ExternalSwiftModuleStubLoader(ASTContext &ctx, ModuleLoadingMode LoadMode,
ExternalSwiftModuleStubScanner(ASTContext &ctx, ModuleLoadingMode LoadMode,
Identifier moduleName,
StringRef ExternalDependencyModuleMap,
InterfaceSubContextDelegate &astDelegate)
@@ -141,14 +141,14 @@ public:
}
public:
static std::unique_ptr<ExternalSwiftModuleStubLoader>
static std::unique_ptr<ExternalSwiftModuleStubScanner>
create(ASTContext &ctx, DependencyTracker *tracker,
ModuleLoadingMode loadMode, StringRef ExternalDependencyModuleMap,
bool IgnoreSwiftSourceInfoFile);
};
} // namespace
void ExternalSwiftModuleStubLoader::parseExternalModuleMap(StringRef fileName) {
void ExternalSwiftModuleStubScanner::parseExternalModuleMap(StringRef fileName) {
ExplicitModuleMapParser parser(Ctx);
auto result =
parser.parseSwiftExplicitModuleMap(fileName, ExternalDependencyModuleMap);
@@ -229,6 +229,15 @@ Optional<ModuleDependencies> SerializedModuleLoaderBase::getModuleDependencies(
cache.findDependencies(moduleName, ModuleDependenciesKind::SwiftExternal))
return found;
auto moduleId = Ctx.getIdentifier(moduleName);
// Instantiate dependency scanning "loaders".
SmallVector<std::unique_ptr<ModuleDependencyScanner>, 2> scanners;
scanners.push_back(std::make_unique<ModuleDependencyScanner>(
Ctx, LoadMode, moduleId, delegate));
scanners.push_back(std::make_unique<ExternalSwiftModuleStubScanner>(
Ctx, LoadMode, moduleId, Ctx.SearchPathOpts.ExternalDependencyModuleMap,
delegate));
// Check whether there is a module with this name that we can import.
for (auto &scanner : scanners) {
if (scanner->canImportModule({moduleId, SourceLoc()})) {