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

Add "Legacy" to the manual referenced name tracker

Browse Source
This commit is contained in:
Robert Widmann
2020-03-31 15:41:42 -07:00
parent 3d09a00a0a
commit 42cfc7eb58
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/AST/SourceFile.h
View File

@@ -466,10 +466,10 @@ public:
virtual bool walk(ASTWalker &walker) override;
ReferencedNameTracker *getReferencedNameTracker() {
ReferencedNameTracker *getLegacyReferencedNameTracker() {
return ReferencedNames ? ReferencedNames.getPointer() : nullptr;
}
const ReferencedNameTracker *getReferencedNameTracker() const {
const ReferencedNameTracker *getLegacyReferencedNameTracker() const {
return ReferencedNames ? ReferencedNames.getPointer() : nullptr;
}

2
lib/AST/Module.cpp
View File

@@ -2604,7 +2604,7 @@ SourceFile::getConfiguredReferencedNameTracker() const {
if (getASTContext().LangOpts.EnableRequestBasedIncrementalDependencies) {
return getRequestBasedReferencedNameTracker();
} else {
return getReferencedNameTracker();
return getLegacyReferencedNameTracker();
}
}

4
lib/AST/NameLookup.cpp
View File

@@ -715,7 +715,7 @@ void namelookup::recordLookupOfTopLevelName(DeclContext *topLevelContext,
auto SF = dyn_cast<SourceFile>(topLevelContext);
if (!SF)
return;
auto *nameTracker = SF->getReferencedNameTracker();
auto *nameTracker = SF->getLegacyReferencedNameTracker();
if (!nameTracker)
return;
nameTracker->addTopLevelName(name.getBaseName(), isCascading);
@@ -1381,7 +1381,7 @@ static void configureLookup(const DeclContext *dc,
tracker = nullptr;
if (auto containingSourceFile =
dyn_cast<SourceFile>(dc->getModuleScopeContext())) {
tracker = containingSourceFile->getReferencedNameTracker();
tracker = containingSourceFile->getLegacyReferencedNameTracker();
}
auto checkLookupCascading = [dc, options]() -> Optional<bool> {

6
lib/Sema/TypeCheckDeclPrimary.cpp
View File

@@ -492,7 +492,7 @@ CheckRedeclarationRequest::evaluate(Evaluator &eval, ValueDecl *current) const {
if (!currentFile || currentDC->isLocalContext())
return std::make_tuple<>();
ReferencedNameTracker *tracker = currentFile->getReferencedNameTracker();
ReferencedNameTracker *tracker = currentFile->getLegacyReferencedNameTracker();
bool isCascading = (current->getFormalAccess() > AccessLevel::FilePrivate);
// Find other potential definitions.
@@ -1962,7 +1962,7 @@ public:
// for the superclass will run (un)qualified lookup which will register
// the appropriate edge, then SuperclassTypeRequest registers the
// potential member edge.
if (auto *tracker = SF->getReferencedNameTracker()) {
if (auto *tracker = SF->getLegacyReferencedNameTracker()) {
bool isPrivate =
CD->getFormalAccess() <= AccessLevel::FilePrivate;
tracker->addUsedMember({Super, Identifier()}, !isPrivate);
@@ -2067,7 +2067,7 @@ public:
(void)PD->hasCircularInheritedProtocols();
if (SF) {
if (auto *tracker = SF->getReferencedNameTracker()) {
if (auto *tracker = SF->getLegacyReferencedNameTracker()) {
bool isNonPrivate = (PD->getFormalAccess() > AccessLevel::FilePrivate);
// FIXME(Evaluator Incremental Dependencies): Remove this. Type lookup
// for the ancestor protocols will run (un)qualified lookup which will

4
lib/Sema/TypeCheckProtocol.cpp
View File

@@ -3876,7 +3876,7 @@ static void recordConformanceDependency(DeclContext *DC,
if (!SF)
return;
auto *tracker = SF->getReferencedNameTracker();
auto *tracker = SF->getLegacyReferencedNameTracker();
if (!tracker)
return;
@@ -5129,7 +5129,7 @@ void TypeChecker::checkConformancesInContext(DeclContext *dc,
SourceFile *SF = dc->getParentSourceFile();
ReferencedNameTracker *tracker = nullptr;
if (SF)
tracker = SF->getReferencedNameTracker();
tracker = SF->getLegacyReferencedNameTracker();
// Check each of the conformances associated with this context.
auto conformances =