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

Merge pull request #65481 from apple/es-pkg-import

Browse Source 
Limit loading error when importing a module built from interface with package-name
This commit is contained in:
Ellie Shin
2023-04-28 12:55:07 -07:00
committed by GitHub
parent c21710651b ceb2884183
commit 2941051fe2
3 changed files with 173 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -825,15 +825,6 @@ LoadedFile *SerializedModuleLoaderBase::loadAST(
if (loadedModuleFile->isConcurrencyChecked())
M.setIsConcurrencyChecked();
if (!loadedModuleFile->getModulePackageName().empty()) {
if (loadedModuleFile->isBuiltFromInterface() &&
loadedModuleFile->getModulePackageName().str() == Ctx.LangOpts.PackageName) {
Ctx.Diags.diagnose(SourceLoc(),
diag::in_package_module_not_compiled_from_source,
M.getBaseIdentifier(),
Ctx.LangOpts.PackageName,
loadedModuleFile->getModuleSourceFilename()
);
}
M.setPackageName(Ctx.getIdentifier(loadedModuleFile->getModulePackageName()));
}
M.setUserModuleVersion(loadedModuleFile->getUserModuleVersion());