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

Sema: fix getPublicModuleName to look only at loaded modules

Browse Source 
When onlyIfImported is true, we should return the public module name
only when the public facing module is already imported. Replace the
call to getModuleByIdentifier with getLoadedModule to prevent trigering
loading that module.

Also fix the test where the CHECK lined ended up matching itself from
the diagnostics output.
This commit is contained in:
Alexis Laferrière
2024-09-11 13:11:32 -07:00
parent 9ce34ab8a0
commit f9a8a674c6
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/AST/Module.cpp
View File

@@ -1923,15 +1923,11 @@ ImportedModule::removeDuplicates(SmallVectorImpl<ImportedModule> &imports) {
}
Identifier ModuleDecl::getPublicModuleName(bool onlyIfImported) const {
if (!PublicModuleName.empty()) {
if (!onlyIfImported)
return PublicModuleName;
if (!PublicModuleName.empty() &&
(!onlyIfImported ||
getASTContext().getLoadedModule(PublicModuleName)))
return PublicModuleName;
bool publicModuleIsImported =
getASTContext().getModuleByIdentifier(PublicModuleName);
if (publicModuleIsImported)
return PublicModuleName;
}
return getName();
}