Skip to content

Commit e78a43d

Browse files
tbaederrtbaederr
committed
[clang][Parse][NFC] Remove unused CommaLocs parameters
1 parent 9f61479 commit e78a43d

File tree

6 files changed

+16
-57
lines changed

6 files changed

+16
-57
lines changed

‎clang/include/clang/Parse/Parser.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1835,21 +1835,16 @@ class Parser : public CodeCompletionHandler {
18351835
ParsedType &CastTy,
18361836
SourceRange &CastRange);
18371837

1838-
typedef SmallVector<SourceLocation, 20> CommaLocsTy;
1839-
18401838
/// ParseExpressionList - Used for C/C++ (argument-)expression-list.
18411839
bool ParseExpressionList(SmallVectorImpl<Expr *> &Exprs,
1842-
SmallVectorImpl<SourceLocation> &CommaLocs,
18431840
llvm::function_ref<void()> ExpressionStarts =
18441841
llvm::function_ref<void()>(),
18451842
bool FailImmediatelyOnInvalidExpr = false,
18461843
bool EarlyTypoCorrection = false);
18471844

18481845
/// ParseSimpleExpressionList - A simple comma-separated list of expressions,
18491846
/// used for misc language extensions.
1850-
bool ParseSimpleExpressionList(SmallVectorImpl<Expr*> &Exprs,
1851-
SmallVectorImpl<SourceLocation> &CommaLocs);
1852-
1847+
bool ParseSimpleExpressionList(SmallVectorImpl<Expr *> &Exprs);
18531848

18541849
/// ParenParseOption - Control what ParseParenExpression will parse.
18551850
enum ParenParseOption {

‎clang/lib/Parse/ParseDecl.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -449,10 +449,8 @@ unsigned Parser::ParseAttributeArgsCommon(
449449
? Sema::ExpressionEvaluationContext::Unevaluated
450450
: Sema::ExpressionEvaluationContext::ConstantEvaluated);
451451

452-
CommaLocsTy CommaLocs;
453452
ExprVector ParsedExprs;
454-
if (ParseExpressionList(ParsedExprs, CommaLocs,
455-
llvm::function_ref<void()>(),
453+
if (ParseExpressionList(ParsedExprs, llvm::function_ref<void()>(),
456454
/*FailImmediatelyOnInvalidExpr=*/true,
457455
/*EarlyTypoCorrection=*/true)) {
458456
SkipUntil(tok::r_paren, StopAtSemi);
@@ -2499,7 +2497,6 @@ Decl *Parser::ParseDeclarationAfterDeclaratorAndAttributes(
24992497
T.consumeOpen();
25002498

25012499
ExprVector Exprs;
2502-
CommaLocsTy CommaLocs;
25032500

25042501
InitializerScopeRAII InitScope(*this, D, ThisDecl);
25052502

@@ -2524,7 +2521,7 @@ Decl *Parser::ParseDeclarationAfterDeclaratorAndAttributes(
25242521
// ProduceConstructorSignatureHelp only on VarDecls.
25252522
ExpressionStarts = SetPreferredType;
25262523
}
2527-
if (ParseExpressionList(Exprs, CommaLocs, ExpressionStarts)) {
2524+
if (ParseExpressionList(Exprs, ExpressionStarts)) {
25282525
if (ThisVarDecl && PP.isCodeCompletionReached() && !CalledSignatureHelp) {
25292526
Actions.ProduceConstructorSignatureHelp(
25302527
ThisVarDecl->getType()->getCanonicalTypeInternal(),
@@ -2537,10 +2534,6 @@ Decl *Parser::ParseDeclarationAfterDeclaratorAndAttributes(
25372534
} else {
25382535
// Match the ')'.
25392536
T.consumeClose();
2540-
2541-
assert(!Exprs.empty() && Exprs.size()-1 == CommaLocs.size() &&
2542-
"Unexpected number of commas!");
2543-
25442537
InitScope.pop();
25452538

25462539
ExprResult Initializer = Actions.ActOnParenListExpr(T.getOpenLocation(),

‎clang/lib/Parse/ParseDeclCXX.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3803,7 +3803,6 @@ MemInitResult Parser::ParseMemInitializer(Decl *ConstructorDecl) {
38033803

38043804
// Parse the optional expression-list.
38053805
ExprVector ArgExprs;
3806-
CommaLocsTy CommaLocs;
38073806
auto RunSignatureHelp = [&] {
38083807
if (TemplateTypeTy.isInvalid())
38093808
return QualType();
@@ -3813,8 +3812,7 @@ MemInitResult Parser::ParseMemInitializer(Decl *ConstructorDecl) {
38133812
CalledSignatureHelp = true;
38143813
return PreferredType;
38153814
};
3816-
if (Tok.isNot(tok::r_paren) &&
3817-
ParseExpressionList(ArgExprs, CommaLocs, [&] {
3815+
if (Tok.isNot(tok::r_paren) && ParseExpressionList(ArgExprs, [&] {
38183816
PreferredType.enterFunctionArgument(Tok.getLocation(),
38193817
RunSignatureHelp);
38203818
})) {

‎clang/lib/Parse/ParseExpr.cpp

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,14 +1961,10 @@ Parser::ParsePostfixExpressionSuffix(ExprResult LHS) {
19611961
ArgExprs.push_back(Idx.get());
19621962
}
19631963
} else if (Tok.isNot(tok::r_square)) {
1964-
CommaLocsTy CommaLocs;
1965-
if (ParseExpressionList(ArgExprs, CommaLocs)) {
1964+
if (ParseExpressionList(ArgExprs)) {
19661965
LHS = Actions.CorrectDelayedTyposInExpr(LHS);
19671966
HasError = true;
19681967
}
1969-
assert(
1970-
(ArgExprs.empty() || ArgExprs.size() == CommaLocs.size() + 1) &&
1971-
"Unexpected number of commas!");
19721968
}
19731969
}
19741970

@@ -2030,10 +2026,9 @@ Parser::ParsePostfixExpressionSuffix(ExprResult LHS) {
20302026

20312027
if (OpKind == tok::lesslessless) {
20322028
ExprVector ExecConfigExprs;
2033-
CommaLocsTy ExecConfigCommaLocs;
20342029
SourceLocation OpenLoc = ConsumeToken();
20352030

2036-
if (ParseSimpleExpressionList(ExecConfigExprs, ExecConfigCommaLocs)) {
2031+
if (ParseSimpleExpressionList(ExecConfigExprs)) {
20372032
(void)Actions.CorrectDelayedTyposInExpr(LHS);
20382033
LHS = ExprError();
20392034
}
@@ -2073,7 +2068,6 @@ Parser::ParsePostfixExpressionSuffix(ExprResult LHS) {
20732068
}
20742069

20752070
ExprVector ArgExprs;
2076-
CommaLocsTy CommaLocs;
20772071
auto RunSignatureHelp = [&]() -> QualType {
20782072
QualType PreferredType = Actions.ProduceCallSignatureHelp(
20792073
LHS.get(), ArgExprs, PT.getOpenLocation());
@@ -2082,7 +2076,7 @@ Parser::ParsePostfixExpressionSuffix(ExprResult LHS) {
20822076
};
20832077
if (OpKind == tok::l_paren || !LHS.isInvalid()) {
20842078
if (Tok.isNot(tok::r_paren)) {
2085-
if (ParseExpressionList(ArgExprs, CommaLocs, [&] {
2079+
if (ParseExpressionList(ArgExprs, [&] {
20862080
PreferredType.enterFunctionArgument(Tok.getLocation(),
20872081
RunSignatureHelp);
20882082
})) {
@@ -2120,9 +2114,6 @@ Parser::ParsePostfixExpressionSuffix(ExprResult LHS) {
21202114
PT.consumeClose();
21212115
LHS = ExprError();
21222116
} else {
2123-
assert(
2124-
(ArgExprs.size() == 0 || ArgExprs.size() - 1 == CommaLocs.size()) &&
2125-
"Unexpected number of commas!");
21262117
Expr *Fn = LHS.get();
21272118
SourceLocation RParLoc = Tok.getLocation();
21282119
LHS = Actions.ActOnCallExpr(getCurScope(), Fn, Loc, ArgExprs, RParLoc,
@@ -3126,11 +3117,9 @@ Parser::ParseParenExpression(ParenParseOption &ExprType, bool stopIfCastExpr,
31263117
} else if (isTypeCast) {
31273118
// Parse the expression-list.
31283119
InMessageExpressionRAIIObject InMessage(*this, false);
3129-
31303120
ExprVector ArgExprs;
3131-
CommaLocsTy CommaLocs;
31323121

3133-
if (!ParseSimpleExpressionList(ArgExprs, CommaLocs)) {
3122+
if (!ParseSimpleExpressionList(ArgExprs)) {
31343123
// FIXME: If we ever support comma expressions as operands to
31353124
// fold-expressions, we'll need to allow multiple ArgExprs here.
31363125
if (ExprType >= FoldExpr && ArgExprs.size() == 1 &&
@@ -3429,7 +3418,6 @@ ExprResult Parser::ParseFoldExpression(ExprResult LHS,
34293418
/// [C++0x] braced-init-list
34303419
/// \endverbatim
34313420
bool Parser::ParseExpressionList(SmallVectorImpl<Expr *> &Exprs,
3432-
SmallVectorImpl<SourceLocation> &CommaLocs,
34333421
llvm::function_ref<void()> ExpressionStarts,
34343422
bool FailImmediatelyOnInvalidExpr,
34353423
bool EarlyTypoCorrection) {
@@ -3473,8 +3461,7 @@ bool Parser::ParseExpressionList(SmallVectorImpl<Expr *> &Exprs,
34733461
break;
34743462
// Move to the next argument, remember where the comma was.
34753463
Token Comma = Tok;
3476-
CommaLocs.push_back(ConsumeToken());
3477-
3464+
ConsumeToken();
34783465
checkPotentialAngleBracketDelimiter(Comma);
34793466
}
34803467
if (SawError) {
@@ -3496,9 +3483,7 @@ bool Parser::ParseExpressionList(SmallVectorImpl<Expr *> &Exprs,
34963483
/// assignment-expression
34973484
/// simple-expression-list , assignment-expression
34983485
/// \endverbatim
3499-
bool
3500-
Parser::ParseSimpleExpressionList(SmallVectorImpl<Expr*> &Exprs,
3501-
SmallVectorImpl<SourceLocation> &CommaLocs) {
3486+
bool Parser::ParseSimpleExpressionList(SmallVectorImpl<Expr *> &Exprs) {
35023487
while (true) {
35033488
ExprResult Expr = ParseAssignmentExpression();
35043489
if (Expr.isInvalid())
@@ -3513,8 +3498,7 @@ Parser::ParseSimpleExpressionList(SmallVectorImpl<Expr*> &Exprs,
35133498

35143499
// Move to the next argument, remember where the comma was.
35153500
Token Comma = Tok;
3516-
CommaLocs.push_back(ConsumeToken());
3517-
3501+
ConsumeToken();
35183502
checkPotentialAngleBracketDelimiter(Comma);
35193503
}
35203504
}

‎clang/lib/Parse/ParseExprCXX.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -981,11 +981,10 @@ bool Parser::ParseLambdaIntroducer(LambdaIntroducer &Intro,
981981
InitKind = LambdaCaptureInitKind::DirectInit;
982982

983983
ExprVector Exprs;
984-
CommaLocsTy Commas;
985984
if (Tentative) {
986985
Parens.skipToEnd();
987986
*Tentative = LambdaIntroducerTentativeParse::Incomplete;
988-
} else if (ParseExpressionList(Exprs, Commas)) {
987+
} else if (ParseExpressionList(Exprs)) {
989988
Parens.skipToEnd();
990989
Init = ExprError();
991990
} else {
@@ -1929,7 +1928,6 @@ Parser::ParseCXXTypeConstructExpression(const DeclSpec &DS) {
19291928
PreferredType.enterTypeCast(Tok.getLocation(), TypeRep.get());
19301929

19311930
ExprVector Exprs;
1932-
CommaLocsTy CommaLocs;
19331931

19341932
auto RunSignatureHelp = [&]() {
19351933
QualType PreferredType;
@@ -1942,7 +1940,7 @@ Parser::ParseCXXTypeConstructExpression(const DeclSpec &DS) {
19421940
};
19431941

19441942
if (Tok.isNot(tok::r_paren)) {
1945-
if (ParseExpressionList(Exprs, CommaLocs, [&] {
1943+
if (ParseExpressionList(Exprs, [&] {
19461944
PreferredType.enterFunctionArgument(Tok.getLocation(),
19471945
RunSignatureHelp);
19481946
})) {
@@ -1960,8 +1958,6 @@ Parser::ParseCXXTypeConstructExpression(const DeclSpec &DS) {
19601958
if (!TypeRep)
19611959
return ExprError();
19621960

1963-
assert((Exprs.size() == 0 || Exprs.size()-1 == CommaLocs.size())&&
1964-
"Unexpected number of commas!");
19651961
return Actions.ActOnCXXTypeConstructExpr(TypeRep, T.getOpenLocation(),
19661962
Exprs, T.getCloseLocation(),
19671963
/*ListInitialization=*/false);
@@ -3239,7 +3235,6 @@ Parser::ParseCXXNewExpression(bool UseGlobal, SourceLocation Start) {
32393235
T.consumeOpen();
32403236
ConstructorLParen = T.getOpenLocation();
32413237
if (Tok.isNot(tok::r_paren)) {
3242-
CommaLocsTy CommaLocs;
32433238
auto RunSignatureHelp = [&]() {
32443239
ParsedType TypeRep =
32453240
Actions.ActOnTypeName(getCurScope(), DeclaratorInfo).get();
@@ -3255,7 +3250,7 @@ Parser::ParseCXXNewExpression(bool UseGlobal, SourceLocation Start) {
32553250
CalledSignatureHelp = true;
32563251
return PreferredType;
32573252
};
3258-
if (ParseExpressionList(ConstructorArgs, CommaLocs, [&] {
3253+
if (ParseExpressionList(ConstructorArgs, [&] {
32593254
PreferredType.enterFunctionArgument(Tok.getLocation(),
32603255
RunSignatureHelp);
32613256
})) {
@@ -3354,9 +3349,7 @@ bool Parser::ParseExpressionListOrTypeId(
33543349
}
33553350

33563351
// It's not a type, it has to be an expression list.
3357-
// Discard the comma locations - ActOnCXXNew has enough parameters.
3358-
CommaLocsTy CommaLocs;
3359-
return ParseExpressionList(PlacementArgs, CommaLocs);
3352+
return ParseExpressionList(PlacementArgs);
33603353
}
33613354

33623355
/// ParseCXXDeleteExpression - Parse a C++ delete-expression. Delete is used

‎clang/lib/Parse/ParseOpenMP.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,6 @@ void Parser::ParseOpenMPReductionInitializerForDecl(VarDecl *OmpPrivParm) {
475475
T.consumeOpen();
476476

477477
ExprVector Exprs;
478-
CommaLocsTy CommaLocs;
479478

480479
SourceLocation LParLoc = T.getOpenLocation();
481480
auto RunSignatureHelp = [this, OmpPrivParm, LParLoc, &Exprs]() {
@@ -485,7 +484,7 @@ void Parser::ParseOpenMPReductionInitializerForDecl(VarDecl *OmpPrivParm) {
485484
CalledSignatureHelp = true;
486485
return PreferredType;
487486
};
488-
if (ParseExpressionList(Exprs, CommaLocs, [&] {
487+
if (ParseExpressionList(Exprs, [&] {
489488
PreferredType.enterFunctionArgument(Tok.getLocation(),
490489
RunSignatureHelp);
491490
})) {
@@ -499,9 +498,6 @@ void Parser::ParseOpenMPReductionInitializerForDecl(VarDecl *OmpPrivParm) {
499498
if (!T.consumeClose())
500499
RLoc = T.getCloseLocation();
501500

502-
assert(!Exprs.empty() && Exprs.size() - 1 == CommaLocs.size() &&
503-
"Unexpected number of commas!");
504-
505501
ExprResult Initializer =
506502
Actions.ActOnParenListExpr(T.getOpenLocation(), RLoc, Exprs);
507503
Actions.AddInitializerToDecl(OmpPrivParm, Initializer.get(),

0 commit comments

Comments
 (0)