Skip to content

Commit 42cfc7e

Browse files
committed
Add "Legacy" to the manual referenced name tracker
1 parent 3d09a00 commit 42cfc7e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

include/swift/AST/SourceFile.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,10 @@ class SourceFile final : public FileUnit {
466466

467467
virtual bool walk(ASTWalker &walker) override;
468468

469-
ReferencedNameTracker *getReferencedNameTracker() {
469+
ReferencedNameTracker *getLegacyReferencedNameTracker() {
470470
return ReferencedNames ? ReferencedNames.getPointer() : nullptr;
471471
}
472-
const ReferencedNameTracker *getReferencedNameTracker() const {
472+
const ReferencedNameTracker *getLegacyReferencedNameTracker() const {
473473
return ReferencedNames ? ReferencedNames.getPointer() : nullptr;
474474
}
475475

lib/AST/Module.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2604,7 +2604,7 @@ SourceFile::getConfiguredReferencedNameTracker() const {
26042604
if (getASTContext().LangOpts.EnableRequestBasedIncrementalDependencies) {
26052605
return getRequestBasedReferencedNameTracker();
26062606
} else {
2607-
return getReferencedNameTracker();
2607+
return getLegacyReferencedNameTracker();
26082608
}
26092609
}
26102610

lib/AST/NameLookup.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ void namelookup::recordLookupOfTopLevelName(DeclContext *topLevelContext,
715715
auto SF = dyn_cast<SourceFile>(topLevelContext);
716716
if (!SF)
717717
return;
718-
auto *nameTracker = SF->getReferencedNameTracker();
718+
auto *nameTracker = SF->getLegacyReferencedNameTracker();
719719
if (!nameTracker)
720720
return;
721721
nameTracker->addTopLevelName(name.getBaseName(), isCascading);
@@ -1381,7 +1381,7 @@ static void configureLookup(const DeclContext *dc,
13811381
tracker = nullptr;
13821382
if (auto containingSourceFile =
13831383
dyn_cast<SourceFile>(dc->getModuleScopeContext())) {
1384-
tracker = containingSourceFile->getReferencedNameTracker();
1384+
tracker = containingSourceFile->getLegacyReferencedNameTracker();
13851385
}
13861386

13871387
auto checkLookupCascading = [dc, options]() -> Optional<bool> {

lib/Sema/TypeCheckDeclPrimary.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ CheckRedeclarationRequest::evaluate(Evaluator &eval, ValueDecl *current) const {
492492
if (!currentFile || currentDC->isLocalContext())
493493
return std::make_tuple<>();
494494

495-
ReferencedNameTracker *tracker = currentFile->getReferencedNameTracker();
495+
ReferencedNameTracker *tracker = currentFile->getLegacyReferencedNameTracker();
496496
bool isCascading = (current->getFormalAccess() > AccessLevel::FilePrivate);
497497

498498
// Find other potential definitions.
@@ -1962,7 +1962,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
19621962
// for the superclass will run (un)qualified lookup which will register
19631963
// the appropriate edge, then SuperclassTypeRequest registers the
19641964
// potential member edge.
1965-
if (auto *tracker = SF->getReferencedNameTracker()) {
1965+
if (auto *tracker = SF->getLegacyReferencedNameTracker()) {
19661966
bool isPrivate =
19671967
CD->getFormalAccess() <= AccessLevel::FilePrivate;
19681968
tracker->addUsedMember({Super, Identifier()}, !isPrivate);
@@ -2067,7 +2067,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
20672067
(void)PD->hasCircularInheritedProtocols();
20682068

20692069
if (SF) {
2070-
if (auto *tracker = SF->getReferencedNameTracker()) {
2070+
if (auto *tracker = SF->getLegacyReferencedNameTracker()) {
20712071
bool isNonPrivate = (PD->getFormalAccess() > AccessLevel::FilePrivate);
20722072
// FIXME(Evaluator Incremental Dependencies): Remove this. Type lookup
20732073
// for the ancestor protocols will run (un)qualified lookup which will

lib/Sema/TypeCheckProtocol.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3876,7 +3876,7 @@ static void recordConformanceDependency(DeclContext *DC,
38763876
if (!SF)
38773877
return;
38783878

3879-
auto *tracker = SF->getReferencedNameTracker();
3879+
auto *tracker = SF->getLegacyReferencedNameTracker();
38803880
if (!tracker)
38813881
return;
38823882

@@ -5129,7 +5129,7 @@ void TypeChecker::checkConformancesInContext(DeclContext *dc,
51295129
SourceFile *SF = dc->getParentSourceFile();
51305130
ReferencedNameTracker *tracker = nullptr;
51315131
if (SF)
5132-
tracker = SF->getReferencedNameTracker();
5132+
tracker = SF->getLegacyReferencedNameTracker();
51335133

51345134
// Check each of the conformances associated with this context.
51355135
auto conformances =

0 commit comments

Comments
 (0)