Skip to content

[AST] NFC: Remove an unnecessary allocation #84204

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
Sep 10, 2025
Merged

[AST] NFC: Remove an unnecessary allocation #84204

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
16 changes: 8 additions & 8 deletions lib/AST/Stmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,9 +804,8 @@ namespace {
/// variables to the `x` variable immediately to its left. A fourth `x` will be
/// the body case variable, whose parent will be set to the `x` within the final
/// case item.
static ArrayRef<VarDecl *> getCaseVarDecls(ASTContext &ctx,
ArrayRef<CaseLabelItem> labelItems) {
SmallVector<VarDecl *, 4> caseVars;
static void getCaseVarDecls(ASTContext &ctx, ArrayRef<CaseLabelItem> labelItems,
SmallVectorImpl<VarDecl *> &caseVars) {
llvm::SmallDenseMap<Identifier, VarDecl *, 4> allVars;

auto foundVar = [&](VarDecl *VD) {
Expand All @@ -833,8 +832,6 @@ static ArrayRef<VarDecl *> getCaseVarDecls(ASTContext &ctx,
// the last pattern variables we saw.
for (auto caseVar : caseVars)
foundVar(caseVar);

return ctx.AllocateCopy(caseVars);
}

struct FallthroughFinder : ASTWalker {
Expand Down Expand Up @@ -885,7 +882,8 @@ CaseStmt::createParsedSwitchCase(ASTContext &ctx, SourceLoc introducerLoc,
ArrayRef<CaseLabelItem> caseLabelItems,
SourceLoc unknownAttrLoc, SourceLoc colonLoc,
BraceStmt *body) {
auto caseVarDecls = getCaseVarDecls(ctx, caseLabelItems);
SmallVector<VarDecl *, 4> caseVarDecls;
getCaseVarDecls(ctx, caseLabelItems, caseVarDecls);
auto fallthroughStmt = FallthroughFinder().findFallthrough(body);
return create(ctx, CaseParentKind::Switch, introducerLoc, caseLabelItems,
unknownAttrLoc, colonLoc, body, caseVarDecls,
Expand All @@ -895,7 +893,8 @@ CaseStmt::createParsedSwitchCase(ASTContext &ctx, SourceLoc introducerLoc,
CaseStmt *CaseStmt::createParsedDoCatch(ASTContext &ctx, SourceLoc catchLoc,
ArrayRef<CaseLabelItem> caseLabelItems,
BraceStmt *body) {
auto caseVarDecls = getCaseVarDecls(ctx, caseLabelItems);
SmallVector<VarDecl *, 4> caseVarDecls;
getCaseVarDecls(ctx, caseLabelItems, caseVarDecls);
return create(ctx, CaseParentKind::DoCatch, catchLoc, caseLabelItems,
/*unknownAttrLoc=*/SourceLoc(), body->getStartLoc(), body,
caseVarDecls, /*implicit=*/false, /*fallthroughStmt=*/nullptr);
Expand All @@ -906,7 +905,8 @@ CaseStmt::createImplicit(ASTContext &ctx, CaseParentKind parentKind,
ArrayRef<CaseLabelItem> caseLabelItems,
BraceStmt *body,
NullablePtr<FallthroughStmt> fallthroughStmt) {
auto caseVarDecls = getCaseVarDecls(ctx, caseLabelItems);
SmallVector<VarDecl *, 4> caseVarDecls;
getCaseVarDecls(ctx, caseLabelItems, caseVarDecls);
return create(ctx, parentKind, /*catchLoc*/ SourceLoc(), caseLabelItems,
/*unknownAttrLoc*/ SourceLoc(), /*colonLoc*/ SourceLoc(), body,
caseVarDecls, /*implicit*/ true, fallthroughStmt);
Expand Down