Skip to content

Commit dd46acd

Browse files
committed
[Parse] Get rid of InternalHandler in parseDecl(). We don't need this anymore.
1 parent 571804b commit dd46acd

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

lib/Parse/ParseDecl.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2043,12 +2043,6 @@ Parser::parseDecl(ParseDeclOptions Flags,
20432043
return IfConfigResult;
20442044
}
20452045

2046-
Decl* LastDecl = nullptr;
2047-
auto InternalHandler = [&](Decl *D) {
2048-
LastDecl = D;
2049-
Handler(D);
2050-
};
2051-
20522046
ParserPosition BeginParserPosition;
20532047
if (isCodeCompletionFirstPass())
20542048
BeginParserPosition = getParserPosition();
@@ -2244,7 +2238,7 @@ Parser::parseDecl(ParseDeclOptions Flags,
22442238
StaticSpelling, tryLoc);
22452239
StaticLoc = SourceLoc(); // we handled static if present.
22462240
MayNeedOverrideCompletion = true;
2247-
std::for_each(Entries.begin(), Entries.end(), InternalHandler);
2241+
std::for_each(Entries.begin(), Entries.end(), Handler);
22482242
if (auto *D = DeclResult.getPtrOrNull())
22492243
markWasHandled(D);
22502244
break;
@@ -2262,7 +2256,7 @@ Parser::parseDecl(ParseDeclOptions Flags,
22622256
case tok::kw_case: {
22632257
llvm::SmallVector<Decl *, 4> Entries;
22642258
DeclResult = parseDeclEnumCase(Flags, Attributes, Entries);
2265-
std::for_each(Entries.begin(), Entries.end(), InternalHandler);
2259+
std::for_each(Entries.begin(), Entries.end(), Handler);
22662260
if (auto *D = DeclResult.getPtrOrNull())
22672261
markWasHandled(D);
22682262
break;
@@ -2300,7 +2294,7 @@ Parser::parseDecl(ParseDeclOptions Flags,
23002294
}
23012295
llvm::SmallVector<Decl *, 4> Entries;
23022296
DeclResult = parseDeclSubscript(Flags, Attributes, Entries);
2303-
std::for_each(Entries.begin(), Entries.end(), InternalHandler);
2297+
std::for_each(Entries.begin(), Entries.end(), Handler);
23042298
MayNeedOverrideCompletion = true;
23052299
if (auto *D = DeclResult.getPtrOrNull())
23062300
markWasHandled(D);
@@ -2375,7 +2369,7 @@ Parser::parseDecl(ParseDeclOptions Flags,
23752369
if (DeclResult.isNonNull()) {
23762370
Decl *D = DeclResult.get();
23772371
if (!declWasHandledAlready(D))
2378-
InternalHandler(DeclResult.get());
2372+
Handler(DeclResult.get());
23792373
}
23802374

23812375
if (!DeclResult.isParseError()) {

0 commit comments

Comments
 (0)