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

Merge pull request #62044 from xymus/module-alias-disambiguate-fix

Browse Source 
[ModuleInterface] Support loading an aliased module with an underlying module
This commit is contained in:
Alexis Laferrière
2022-11-11 11:55:44 -08:00
committed by GitHub
parent 5fa31c68fe 0e40dac015
commit b526205f42
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -614,7 +614,8 @@ class ModuleInterfaceLoaderImpl {
StringRef inParentDirName =
path::filename(path::parent_path(interfacePath));
if (path::extension(inParentDirName) == ".swiftmodule") {
assert(path::stem(inParentDirName) == moduleName);
assert(path::stem(inParentDirName) ==
ctx.getRealModuleName(ctx.getIdentifier(moduleName)).str());
path::append(scratch, inParentDirName);
}
path::append(scratch, path::filename(modulePath));