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

Use real module names to load modules

Browse Source 
Add ModuleInterface option meta tag for -module-alias
Add tests loading modules with -module-alias for swiftmodule and swiftinterface
with various loaders incl. serialized, explicit, and source loader.
This commit is contained in:
elsh
2021-10-04 16:28:12 -07:00
parent 55b9fa11d8
commit 2efab715cd
5 changed files with 109 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Serialization/ModuleFile.cpp
View File

@@ -131,8 +131,15 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc,
Status status = Status::Valid;
ModuleDecl *M = file->getParentModule();
if (M->getName().str() != Core->Name)
// The real (on-disk) name of the module should be checked here as that's the
// actually loaded module. In case module aliasing is used when building the main
// module, e.g. -module-name MyModule -module-alias Foo=Bar, the loaded module
// that maps to 'Foo' is actually Bar.swiftmodule|.swiftinterface (applies to swift
// modules only), which is retrieved via M->getRealName(). If no module aliasing is
// used, M->getRealName() will return the same value as M->getName(), which is 'Foo'.
if (M->getRealName().str() != Core->Name) {
return error(Status::NameMismatch);
}
ASTContext &ctx = getContext();