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

Address feedback

Browse Source
This commit is contained in:
Arnold Schwaighofer
2018-11-08 10:43:32 -08:00
parent 963c64e3e7
commit e4f4dfcf84
8 changed files with 52 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/AST/Module.cpp
View File

@@ -1410,9 +1410,9 @@ bool SourceFile::hasPrivateImport(AccessLevel accessLevel,
std::pair<ImportOptions, StringRef>>;
auto *module = ofDecl->getModuleContext();
if (accessLevel == AccessLevel::Internal ||
accessLevel == AccessLevel::Public) {
switch (accessLevel) {
case AccessLevel::Internal:
case AccessLevel::Public:
// internal/public access only needs an import marked as @_private. The
// filename does not need to match (and we don't serialize it for such
// decls).
@@ -1422,7 +1422,14 @@ bool SourceFile::hasPrivateImport(AccessLevel accessLevel,
importPair.second.first.contains(
ImportFlags::PrivateImport);
});
case AccessLevel::Open:
return true;
case AccessLevel::FilePrivate:
case AccessLevel::Private:
// Fallthrough.
break;
}
auto *DC = ofDecl->getDeclContext();
if (!DC)
return false;
@@ -1433,9 +1440,6 @@ bool SourceFile::hasPrivateImport(AccessLevel accessLevel,
StringRef filename;
if (auto *file = dyn_cast<LoadedFile>(scope)) {
filename = file->getFilenameForPrivateDecl(ofDecl);
} else if (auto *file = dyn_cast<SourceFile>(scope)) {
// Source files cannot be imported from another module.
return false;
} else
return false;