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

ExplictModuleLoader: don't fail while no explicit Swift module map is specified

Browse Source 
We will eventually move the protocol entirely to using a JSON file for
explicit Swift modules. Before we finish migrating, we should be forgiving
about using the legacy -swift-module-file argument.
This commit is contained in:
Xi Ge
2020-06-19 10:23:41 -07:00
parent 23ef061b14
commit 0fd75b4eb9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -1602,8 +1602,11 @@ ExplicitSwiftModuleLoader::create(ASTContext &ctx,
new ExplicitSwiftModuleLoader(ctx, tracker, loadMode, new ExplicitSwiftModuleLoader(ctx, tracker, loadMode,
IgnoreSwiftSourceInfoFile)); IgnoreSwiftSourceInfoFile));
auto &Impl = result->Impl; auto &Impl = result->Impl;
// Parse a JSON file to collect explicitly built modules. // If the explicit module map is given, try parse it.
Impl.parseSwiftExplicitModuleMap(ExplicitSwiftModuleMap); if (!ExplicitSwiftModuleMap.empty()) {
// Parse a JSON file to collect explicitly built modules.
Impl.parseSwiftExplicitModuleMap(ExplicitSwiftModuleMap);
}
// Collect .swiftmodule paths from -swift-module-path // Collect .swiftmodule paths from -swift-module-path
// FIXME: remove these. // FIXME: remove these.
for (auto path: ExplicitModulePaths) { for (auto path: ExplicitModulePaths) {