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

Clean up logic from previous commit.

Browse Source 
No functionality change.

Swift SVN r15085
This commit is contained in:
Jordan Rose
2014-03-14 22:24:23 +00:00
parent c7804dc779
commit fd1f276804
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Serialization/ModuleFile.cpp
View File

@@ -873,8 +873,8 @@ void ModuleFile::getImportedModules(
SmallVectorImpl<Module::ImportedModule> &results,
Module::ImportFilter filter) {
PrettyModuleFileDeserialization stackEntry(*this);
bool includeShadowedModule =
(filter != Module::ImportFilter::Private && Bits.IsFramework);
bool includeShadowedModule = (filter != Module::ImportFilter::Private &&
ShadowedModule && Bits.IsFramework);
for (auto &dep : Dependencies) {
if (filter != Module::ImportFilter::All &&
@@ -892,8 +892,7 @@ void ModuleFile::getImportedModules(
// Make sure to go through getModule() instead of accessing ShadowedModule
// directly, to force loading it.
if (includeShadowedModule)
if (ShadowedModule)
results.push_back({ {}, ShadowedModule });
results.push_back({ {}, ShadowedModule });
}
void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {