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

Drop "Private Deps" Flag

Browse Source 
In order for type body fingerprints to work, these declarations must always be included. Drop the ability to turn this off.
This commit is contained in:
Robert Widmann
2020-10-01 13:09:58 -07:00
parent 74765a8ba8
commit 964f640636
19 changed files with 50 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
lib/AST/FrontendSourceFileDepGraphFactory.cpp
View File

@@ -65,50 +65,6 @@ static std::string mangleTypeAsContext(const NominalTypeDecl *NTD) {
return !NTD ? "" : Mangler.mangleTypeAsContextUSR(NTD);
}
//==============================================================================
// MARK: Privacy queries
//==============================================================================
/// Return true if \ref ED does not contain a member that can affect other
/// files.
static bool allMembersArePrivate(const ExtensionDecl *ED) {
return std::all_of(
ED->getMembers().begin(), ED->getMembers().end(),
[](const Decl *d) { return d->isPrivateToEnclosingFile(); });
}
/// \ref inheritedType, an inherited protocol, return true if this inheritance
/// cannot affect other files.
static bool extendedTypeIsPrivate(TypeLoc inheritedType) {
auto type = inheritedType.getType();
if (!type)
return true;
if (!type->isExistentialType()) {
// Be conservative. We don't know how to deal with other extended types.
return false;
}
auto layout = type->getExistentialLayout();
assert(!layout.explicitSuperclass &&
"Should not have a subclass existential "
"in the inheritance clause of an extension");
for (auto protoTy : layout.getProtocols()) {
if (!protoTy->getDecl()->isPrivateToEnclosingFile())
return false;
}
return true;
}
/// Return true if \ref ED does not inherit a protocol that can affect other
/// files. Was called "justMembers" in ReferenceDependencies.cpp
/// \ref ED might be null.
static bool allInheritedProtocolsArePrivate(const ExtensionDecl *ED) {
return std::all_of(ED->getInherited().begin(), ED->getInherited().end(),
extendedTypeIsPrivate);
}
//==============================================================================
// MARK: DependencyKey - creation for Decls
//==============================================================================
@@ -262,24 +218,11 @@ FrontendSourceFileDepGraphFactory::FrontendSourceFileDepGraphFactory(
SourceFile *SF, StringRef outputPath, const DependencyTracker &depTracker,
const bool alsoEmitDotFile)
: AbstractSourceFileDepGraphFactory(
computeIncludePrivateDeps(SF), SF->getASTContext().hadError(),
SF->getASTContext().hadError(),
outputPath, getInterfaceHash(SF), alsoEmitDotFile,
SF->getASTContext().Diags),
SF(SF), depTracker(depTracker) {}
bool FrontendSourceFileDepGraphFactory::computeIncludePrivateDeps(
SourceFile *SF) {
// Since, when fingerprints are enabled,
// the parser diverts token hashing into per-body fingerprints
// before it can know if a difference is in a private type,
// in order to be able to test the changed fingerprints
// we force the inclusion of private declarations when fingerprints
// are enabled.
return SF->getASTContext()
.LangOpts.FineGrainedDependenciesIncludeIntrafileOnes ||
SF->getASTContext().LangOpts.EnableTypeFingerprints;
}
/// Centralize the invariant that the fingerprint of the whole file is the
/// interface hash
std::string FrontendSourceFileDepGraphFactory::getFingerprint(SourceFile *SF) {
@@ -297,10 +240,6 @@ namespace {
/// Takes all the Decls in a SourceFile, and collects them into buckets by
/// groups of DeclKinds. Also casts them to more specific types
struct DeclFinder {
/// Existing system excludes private decls in some cases.
/// In the future, we might not want to do this, so use bool to decide.
const bool includePrivateDecls;
// The extracted Decls:
ConstPtrVec<ExtensionDecl> extensions;
ConstPtrVec<OperatorDecl> operators;
@@ -319,19 +258,17 @@ public:
/// Construct me and separates the Decls.
// clang-format off
DeclFinder(ArrayRef<Decl *> topLevelDecls,
const bool includePrivateDecls,
LookupClassMember lookupClassMember)
: includePrivateDecls(includePrivateDecls) {
LookupClassMember lookupClassMember) {
for (const Decl *const D : topLevelDecls) {
select<ExtensionDecl, DeclKind::Extension>(D, extensions, false) ||
select<ExtensionDecl, DeclKind::Extension>(D, extensions) ||
select<OperatorDecl, DeclKind::InfixOperator, DeclKind::PrefixOperator,
DeclKind::PostfixOperator>(D, operators, false) ||
DeclKind::PostfixOperator>(D, operators) ||
select<PrecedenceGroupDecl, DeclKind::PrecedenceGroup>(
D, precedenceGroups, false) ||
D, precedenceGroups) ||
select<NominalTypeDecl, DeclKind::Enum, DeclKind::Struct,
DeclKind::Class, DeclKind::Protocol>(D, topNominals, true) ||
DeclKind::Class, DeclKind::Protocol>(D, topNominals) ||
select<ValueDecl, DeclKind::TypeAlias, DeclKind::Var, DeclKind::Func,
DeclKind::Accessor>(D, topValues, true);
DeclKind::Accessor>(D, topValues);
}
// clang-format on
// The order is important because some of these use instance variables
@@ -360,18 +297,7 @@ private:
/// (indirectly recursive)
void findNominalsAndOperatorsIn(const NominalTypeDecl *const NTD,
const ExtensionDecl *ED = nullptr) {
if (excludeIfPrivate(NTD))
return;
const bool exposedProtocolIsExtended =
ED && !allInheritedProtocolsArePrivate(ED);
if (ED && !includePrivateDecls && !exposedProtocolIsExtended &&
std::all_of(
ED->getMembers().begin(), ED->getMembers().end(),
[&](const Decl *D) { return D->isPrivateToEnclosingFile(); })) {
return;
}
if (includePrivateDecls || !ED || exposedProtocolIsExtended)
allNominals.push_back(NTD);
allNominals.push_back(NTD);
potentialMemberHolders.push_back(NTD);
findNominalsAndOperatorsInMembers(ED ? ED->getMembers()
: NTD->getMembers());
@@ -383,7 +309,7 @@ private:
void findNominalsAndOperatorsInMembers(const DeclRange members) {
for (const Decl *const D : members) {
auto *VD = dyn_cast<ValueDecl>(D);
if (!VD || excludeIfPrivate(VD))
if (!VD)
continue;
if (VD->getName().isOperator())
memberOperatorDecls.push_back(cast<FuncDecl>(D));
@@ -396,19 +322,20 @@ private:
void findValuesInExtensions() {
for (const auto *ED : extensions) {
const auto *const NTD = ED->getExtendedNominal();
if (!NTD || excludeIfPrivate(NTD))
if (!NTD) {
continue;
if (!includePrivateDecls &&
(!allInheritedProtocolsArePrivate(ED) || allMembersArePrivate(ED)))
continue;
for (const auto *member : ED->getMembers())
if (const auto *VD = dyn_cast<ValueDecl>(member))
if (VD->hasName() &&
(includePrivateDecls || !VD->isPrivateToEnclosingFile())) {
const auto *const NTD = ED->getExtendedNominal();
if (NTD)
valuesInExtensions.push_back(std::make_pair(NTD, VD));
}
}
for (const auto *member : ED->getMembers()) {
const auto *VD = dyn_cast<ValueDecl>(member);
if (!VD || !VD->hasName()) {
continue;
}
if (const auto *const NTD = ED->getExtendedNominal()) {
valuesInExtensions.push_back(std::make_pair(NTD, VD));
}
}
}
}
@@ -431,30 +358,19 @@ private:
/// \returns true if successful.
template <typename DesiredDeclType, DeclKind firstKind,
DeclKind... restOfKinds>
bool select(const Decl *const D, ConstPtrVec<DesiredDeclType> &foundDecls,
const bool canExcludePrivateDecls) {
bool select(const Decl *const D, ConstPtrVec<DesiredDeclType> &foundDecls) {
if (D->getKind() == firstKind) {
auto *dd = cast<DesiredDeclType>(D);
const bool exclude = canExcludePrivateDecls && excludeIfPrivate(dd);
if (!exclude)
foundDecls.push_back(cast<DesiredDeclType>(D));
foundDecls.push_back(cast<DesiredDeclType>(D));
return true;
}
return select<DesiredDeclType, restOfKinds...>(D, foundDecls,
canExcludePrivateDecls);
return select<DesiredDeclType, restOfKinds...>(D, foundDecls);
}
/// Terminate the template recursion.
template <typename DesiredDeclType>
bool select(const Decl *const D, ConstPtrVec<DesiredDeclType> &foundDecls,
bool) {
bool select(const Decl *const D, ConstPtrVec<DesiredDeclType> &foundDecls) {
return false;
}
/// Return true if \param D should be excluded on privacy grounds.
bool excludeIfPrivate(const Decl *const D) {
return !includePrivateDecls && D->isPrivateToEnclosingFile();
}
};
} // namespace
@@ -464,7 +380,7 @@ void FrontendSourceFileDepGraphFactory::addAllDefinedDecls() {
// Many kinds of Decls become top-level depends.
DeclFinder declFinder(SF->getTopLevelDecls(), includePrivateDeps,
DeclFinder declFinder(SF->getTopLevelDecls(),
[this](VisibleDeclConsumer &consumer) {
SF->lookupClassMembers({}, consumer);
});
@@ -513,14 +429,11 @@ class UsedDeclEnumerator {
const DependencyKey sourceFileInterface;
const DependencyKey sourceFileImplementation;
const bool includeIntrafileDeps;
function_ref<void(const DependencyKey &, const DependencyKey &)> createDefUse;
public:
UsedDeclEnumerator(
SourceFile *SF, const DependencyTracker &depTracker, StringRef swiftDeps,
bool includeIntrafileDeps,
function_ref<void(const DependencyKey &, const DependencyKey &)>
createDefUse)
: SF(SF), depTracker(depTracker), swiftDeps(swiftDeps),
@@ -528,7 +441,7 @@ public:
DeclAspect::interface, swiftDeps)),
sourceFileImplementation(DependencyKey::createKeyForWholeSourceFile(
DeclAspect::implementation, swiftDeps)),
includeIntrafileDeps(includeIntrafileDeps), createDefUse(createDefUse) {
createDefUse(createDefUse) {
}
public:
@@ -581,11 +494,6 @@ private:
return;
}
bool isPrivate = subject->isPrivateToEnclosingFile();
if (isPrivate && !includeIntrafileDeps) {
return;
}
std::string context =
DependencyKey::computeContextForProvidedEntity<NodeKind::nominal>(
subject);
@@ -604,7 +512,7 @@ private:
} // end namespace
void FrontendSourceFileDepGraphFactory::addAllUsedDecls() {
UsedDeclEnumerator(SF, depTracker, swiftDeps, includePrivateDeps,
UsedDeclEnumerator(SF, depTracker, swiftDeps,
[&](const DependencyKey &def, const DependencyKey &use) {
addAUsedDecl(def, use);
})
@@ -644,7 +552,7 @@ FrontendSourceFileDepGraphFactory::getFingerprintIfAny(const Decl *d) {
ModuleDepGraphFactory::ModuleDepGraphFactory(ModuleDecl *Mod, bool emitDot)
: AbstractSourceFileDepGraphFactory(
/*include private*/ true, Mod->getASTContext().hadError(),
Mod->getASTContext().hadError(),
Mod->getNameStr(), "0xBADBEEF", emitDot, Mod->getASTContext().Diags),
Mod(Mod) {}
@@ -656,7 +564,7 @@ void ModuleDepGraphFactory::addAllDefinedDecls() {
SmallVector<Decl *, 32> TopLevelDecls;
Mod->getTopLevelDecls(TopLevelDecls);
DeclFinder declFinder(TopLevelDecls, includePrivateDeps,
DeclFinder declFinder(TopLevelDecls,
[this](VisibleDeclConsumer &consumer) {
return Mod->lookupClassMembers({}, consumer);
});