Skip to content

Parse: Remove AlreadyHandledDecls set #34283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2020
Merged

Parse: Remove AlreadyHandledDecls set #34283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions include/swift/Parse/Parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,17 +943,6 @@ class Parser {
void consumeDecl(ParserPosition BeginParserPosition, ParseDeclOptions Flags,
bool IsTopLevel);

/// FIXME: Remove this, it's vestigial.
llvm::SmallPtrSet<Decl *, 2> AlreadyHandledDecls;

void markWasHandled(Decl *D) {
AlreadyHandledDecls.insert(D);
}

bool declWasHandledAlready(Decl *D) {
return AlreadyHandledDecls.erase(D);
}

ParserResult<Decl> parseDecl(ParseDeclOptions Flags,
bool IsAtStartOfLineOrPreviousHadSemi,
llvm::function_ref<void(Decl*)> Handler);
Expand Down
13 changes: 6 additions & 7 deletions lib/Parse/ParseDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3849,6 +3849,8 @@ Parser::parseDecl(ParseDeclOptions Flags,
auto OrigTok = Tok;
bool MayNeedOverrideCompletion = false;

bool HandlerAlreadyCalled = false;

auto parseLetOrVar = [&](bool HasLetOrVarKeyword) {
// Collect all modifiers into a modifier list.
DeclParsingContext.setCreateSyntax(SyntaxKind::VariableDecl);
Expand All @@ -3861,8 +3863,7 @@ Parser::parseDecl(ParseDeclOptions Flags,
&& isCodeCompletionFirstPass())
return;
std::for_each(Entries.begin(), Entries.end(), Handler);
if (auto *D = DeclResult.getPtrOrNull())
markWasHandled(D);
HandlerAlreadyCalled = true;
};

auto parseFunc = [&](bool HasFuncKeyword) {
Expand Down Expand Up @@ -3909,8 +3910,7 @@ Parser::parseDecl(ParseDeclOptions Flags,
isCodeCompletionFirstPass())
break;
std::for_each(Entries.begin(), Entries.end(), Handler);
if (auto *D = DeclResult.getPtrOrNull())
markWasHandled(D);
HandlerAlreadyCalled = true;
break;
}
case tok::kw_class:
Expand Down Expand Up @@ -3955,8 +3955,7 @@ Parser::parseDecl(ParseDeclOptions Flags,
break;
std::for_each(Entries.begin(), Entries.end(), Handler);
MayNeedOverrideCompletion = true;
if (auto *D = DeclResult.getPtrOrNull())
markWasHandled(D);
HandlerAlreadyCalled = true;
break;
}

Expand Down Expand Up @@ -4136,7 +4135,7 @@ Parser::parseDecl(ParseDeclOptions Flags,

if (DeclResult.isNonNull()) {
Decl *D = DeclResult.get();
if (!declWasHandledAlready(D))
if (!HandlerAlreadyCalled)
Handler(D);
setOriginalDeclarationForDifferentiableAttributes(D->getAttrs(), D);
}
Expand Down