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

Merge pull request #27786 from davidungar/fix-lazy-function-bodies-rdar-56384593

Browse Source 
[NameLookup, ASTScope] Create lazily-parsed function body scopes.
This commit is contained in:
David Ungar
2019-10-18 21:48:28 -07:00
committed by GitHub
parent b854e99d0a 8469abb916
commit e67921f679
4 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/AST/ASTScopeCreation.cpp
View File

@@ -1359,8 +1359,8 @@ void AbstractFunctionDeclScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
}
// Create scope for the body.
// We create body scopes when there is no body for source kit to complete
// erroneous code in bodies. But don't let compiler synthesize one.
if (decl->getBodySourceRange().isValid() && decl->getBody(false)) {
// erroneous code in bodies.
if (decl->getBodySourceRange().isValid()) {
if (AbstractFunctionBodyScope::isAMethod(decl))
scopeCreator.constructExpandAndInsertUncheckable<MethodBodyScope>(leaf,
decl);
@@ -1901,6 +1901,7 @@ void AbstractFunctionBodyScope::beCurrent() {
bodyWhenLastExpanded = decl->getBody(false);
}
bool AbstractFunctionBodyScope::isCurrentIfWasExpanded() const {
// Pass in false to keep the compiler from synthesizing one.
return bodyWhenLastExpanded == decl->getBody(false);
}