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

Use SeparateCaching

Browse Source
This commit is contained in:
David Ungar
2019-10-08 17:08:55 -07:00
parent 86ec6a00da
commit a9ab4aa8c2
6 changed files with 106 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/ASTScopeLookup.cpp
View File

@@ -40,7 +40,6 @@ llvm::SmallVector<const ASTScopeImpl *, 0> ASTScopeImpl::unqualifiedLookup(
SourceFile *sourceFile, const DeclName name, const SourceLoc loc,
const DeclContext *const startingContext, DeclConsumer consumer) {
SmallVector<const ASTScopeImpl *, 0> history;
const auto *start =
findStartingScopeForLookup(sourceFile, name, loc, startingContext);
if (start)
@@ -59,7 +58,6 @@ const ASTScopeImpl *ASTScopeImpl::findStartingScopeForLookup(
auto *const fileScope = sourceFile->getScope().impl;
// Parser may have added decls to source file, since previous lookup
fileScope->addNewDeclsToScopeTree();
if (name.isOperator())
return fileScope; // operators always at file scope
@@ -116,7 +114,7 @@ ASTScopeImpl::findInnermostEnclosingScope(SourceLoc loc,
const ASTScopeImpl *ASTScopeImpl::findInnermostEnclosingScopeImpl(
SourceLoc loc, NullablePtr<raw_ostream> os, SourceManager &sourceMgr,
ScopeCreator &scopeCreator) {
reexpandIfObsolete(scopeCreator);
expandAndBeCurrentDetectingRecursion(scopeCreator);
auto child = findChildContaining(loc, sourceMgr);
if (!child)
return this;