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

Restore local type declarations list

Browse Source
This commit is contained in:
Robert Widmann
2017-01-05 18:10:18 -07:00
parent 9c7a6cfaa3
commit d2570cb964
14 changed files with 61 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Parse/ParseDecl.cpp
View File

@@ -1850,8 +1850,9 @@ void Parser::setLocalDiscriminator(ValueDecl *D) {
if (!CurLocalContext || !D->getDeclContext()->isLocalContext())
return;
if (getScopeInfo().isStaticallyInactiveConfigBlock())
return;
if (auto TD = dyn_cast<TypeDecl>(D))
if (!getScopeInfo().isInactiveConfigBlock())
SF.LocalTypeDecls.insert(TD);
Identifier name = D->getName();
unsigned discriminator = CurLocalContext->claimNextNamedDiscriminator(name);
@@ -2217,6 +2218,15 @@ ParserStatus Parser::parseDecl(ParseDeclOptions Flags,
break;
}
if (auto SF = CurDeclContext->getParentSourceFile()) {
if (!getScopeInfo().isInactiveConfigBlock()) {
for (auto Attr : Attributes) {
if (isa<ObjCAttr>(Attr) || isa<DynamicAttr>(Attr))
SF->AttrsRequiringFoundation.insert(Attr);
}
}
}
if (FoundCCTokenInAttr) {
if (CodeCompletion) {
CodeCompletion->completeDeclAttrKeyword(DeclResult.getPtrOrNull(),