[clang] Remove unused parameter; NFC (PR #193767)
Aaron Ballman via cfe-commits
cfe-commits at lists.llvm.org
Thu Apr 23 07:50:20 PDT 2026
https://github.com/AaronBallman created https://github.com/llvm/llvm-project/pull/193767
As part of removing delayed typo handling in
9eef4d1c5fa6b1bcbbe675c14ca8301d5d346f7b, the KeywordReplacement parameter ended up being unused, so this patch removes it and adjusts the callers. This issue was discovered by a downstream static analysis scan.
It is an NFC change because the callers of the function were looking for a sentinel return value to determine whether they needed to call UnconsumeToken on that parameter, but those calls cannot be reached because the sentinel return value cannot be produced any longer.
>From 440937ada901e1ab236c72f8b78a277cb85d3ed6 Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron at aaronballman.com>
Date: Thu, 23 Apr 2026 10:47:08 -0400
Subject: [PATCH] Remove unused parameter; NFC
As part of removing delayed typo handling in
9eef4d1c5fa6b1bcbbe675c14ca8301d5d346f7b, the KeywordReplacement
parameter ended up being unused, so this patch removes it and adjusts
the callers.
It is an NFC change because the callers of the function were looking
for a sentinel return value to determine whether they needed to call
UnconsumeToken on that parameter, but those calls cannot be reached
because the sentinel return value cannot be produced any longer.
---
clang/include/clang/Parse/Parser.h | 3 +--
clang/include/clang/Sema/Sema.h | 3 +--
clang/lib/Parse/ParseExpr.cpp | 13 ++-----------
clang/lib/Parse/ParseExprCXX.cpp | 15 +++------------
clang/lib/Parse/ParseOpenMP.cpp | 8 ++------
clang/lib/Sema/SemaExpr.cpp | 2 +-
6 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/clang/include/clang/Parse/Parser.h b/clang/include/clang/Parse/Parser.h
index e29c43f8751ec..05ff3ea3912f3 100644
--- a/clang/include/clang/Parse/Parser.h
+++ b/clang/include/clang/Parse/Parser.h
@@ -4467,8 +4467,7 @@ class Parser : public CodeCompletionHandler {
//===--------------------------------------------------------------------===//
// C++ Expressions
- ExprResult tryParseCXXIdExpression(CXXScopeSpec &SS, bool isAddressOfOperand,
- Token &Replacement);
+ ExprResult tryParseCXXIdExpression(CXXScopeSpec &SS, bool isAddressOfOperand);
ExprResult tryParseCXXPackIndexingExpression(ExprResult PackIdExpression);
ExprResult ParseCXXPackIndexingExpression(ExprResult PackIdExpression);
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index 20f7d84cfc475..78a9d726d33eb 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -7260,8 +7260,7 @@ class Sema final : public SemaBase {
SourceLocation TemplateKWLoc, UnqualifiedId &Id,
bool HasTrailingLParen, bool IsAddressOfOperand,
CorrectionCandidateCallback *CCC = nullptr,
- bool IsInlineAsmIdentifier = false,
- Token *KeywordReplacement = nullptr);
+ bool IsInlineAsmIdentifier = false);
/// Decomposes the given name into a DeclarationNameInfo, its location, and
/// possibly a list of template arguments.
diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index aacefb1a5d828..5a3a74f733597 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -863,8 +863,7 @@ Parser::ParseCastExpression(CastParseKind ParseKind, bool isAddressOfOperand,
case tok::annot_non_type_dependent:
case tok::annot_non_type_undeclared: {
CXXScopeSpec SS;
- Token Replacement;
- Res = tryParseCXXIdExpression(SS, isAddressOfOperand, Replacement);
+ Res = tryParseCXXIdExpression(SS, isAddressOfOperand);
assert(!Res.isUnset() &&
"should not perform typo correction on annotation token");
break;
@@ -1029,7 +1028,6 @@ Parser::ParseCastExpression(CastParseKind ParseKind, bool isAddressOfOperand,
UnqualifiedId Name;
CXXScopeSpec ScopeSpec;
SourceLocation TemplateKWLoc;
- Token Replacement;
CastExpressionIdValidator Validator(Tok, CorrectionBehavior);
Validator.IsAddressOfOperand = isAddressOfOperand;
if (Tok.isOneOf(tok::periodstar, tok::arrowstar)) {
@@ -1042,14 +1040,7 @@ Parser::ParseCastExpression(CastParseKind ParseKind, bool isAddressOfOperand,
Res = Actions.ActOnIdExpression(
getCurScope(), ScopeSpec, TemplateKWLoc, Name, Tok.is(tok::l_paren),
isAddressOfOperand, &Validator,
- /*IsInlineAsmIdentifier=*/false,
- Tok.is(tok::r_paren) ? nullptr : &Replacement);
- if (!Res.isInvalid() && Res.isUnset()) {
- UnconsumeToken(Replacement);
- return ParseCastExpression(
- ParseKind, isAddressOfOperand, NotCastExpr, CorrectionBehavior,
- /*isVectorLiteral=*/false, NotPrimaryExpression);
- }
+ /*IsInlineAsmIdentifier=*/false);
Res = tryParseCXXPackIndexingExpression(Res);
if (!Res.isInvalid() && Tok.is(tok::less))
checkPotentialAngleBracket(Res);
diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp
index d0d9def01a4c2..f3e5968746b40 100644
--- a/clang/lib/Parse/ParseExprCXX.cpp
+++ b/clang/lib/Parse/ParseExprCXX.cpp
@@ -566,8 +566,7 @@ bool Parser::ParseOptionalCXXScopeSpecifier(
}
ExprResult Parser::tryParseCXXIdExpression(CXXScopeSpec &SS,
- bool isAddressOfOperand,
- Token &Replacement) {
+ bool isAddressOfOperand) {
ExprResult E;
// We may have already annotated this id-expression.
@@ -620,8 +619,7 @@ ExprResult Parser::tryParseCXXIdExpression(CXXScopeSpec &SS,
E = Actions.ActOnIdExpression(
getCurScope(), SS, TemplateKWLoc, Name, Tok.is(tok::l_paren),
- isAddressOfOperand, /*CCC=*/nullptr, /*IsInlineAsmIdentifier=*/false,
- &Replacement);
+ isAddressOfOperand, /*CCC=*/nullptr, /*IsInlineAsmIdentifier=*/false);
break;
}
@@ -667,15 +665,8 @@ ExprResult Parser::ParseCXXIdExpression(bool isAddressOfOperand) {
/*ObjectHasErrors=*/false,
/*EnteringContext=*/false);
- Token Replacement;
ExprResult Result =
- tryParseCXXIdExpression(SS, isAddressOfOperand, Replacement);
- if (Result.isUnset()) {
- // If the ExprResult is valid but null, then typo correction suggested a
- // keyword replacement that needs to be reparsed.
- UnconsumeToken(Replacement);
- Result = tryParseCXXIdExpression(SS, isAddressOfOperand, Replacement);
- }
+ tryParseCXXIdExpression(SS, isAddressOfOperand);
assert(!Result.isUnset() && "Typo correction suggested a keyword replacement "
"for a previous keyword suggestion");
return Result;
diff --git a/clang/lib/Parse/ParseOpenMP.cpp b/clang/lib/Parse/ParseOpenMP.cpp
index 0e92c3fa1b572..45a47ec797f01 100644
--- a/clang/lib/Parse/ParseOpenMP.cpp
+++ b/clang/lib/Parse/ParseOpenMP.cpp
@@ -3125,12 +3125,10 @@ OMPClause *Parser::ParseOpenMPUsesAllocatorClause(OpenMPDirectiveKind DKind) {
ConsumeToken();
CXXScopeSpec SS;
- Token Replacement;
ExprResult AllocatorExpr =
getLangOpts().CPlusPlus
? ParseCXXIdExpression()
- : tryParseCXXIdExpression(SS, /*isAddressOfOperand=*/false,
- Replacement);
+ : tryParseCXXIdExpression(SS, /*isAddressOfOperand=*/false);
if (AllocatorExpr.isInvalid()) {
SkipUntil(
@@ -3159,12 +3157,10 @@ OMPClause *Parser::ParseOpenMPUsesAllocatorClause(OpenMPDirectiveKind DKind) {
// Parse 'Allocator(expr)' for <5.2
CXXScopeSpec SS;
- Token Replacement;
ExprResult Allocator =
getLangOpts().CPlusPlus
? ParseCXXIdExpression()
- : tryParseCXXIdExpression(SS, /*isAddressOfOperand=*/false,
- Replacement);
+ : tryParseCXXIdExpression(SS, /*isAddressOfOperand=*/false);
if (Allocator.isInvalid()) {
SkipUntil(tok::comma, tok::r_paren, tok::annot_pragma_openmp_end,
StopBeforeMatch);
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 006853df6ff57..5ddb8fa4939fc 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -2819,7 +2819,7 @@ Sema::ActOnIdExpression(Scope *S, CXXScopeSpec &SS,
SourceLocation TemplateKWLoc, UnqualifiedId &Id,
bool HasTrailingLParen, bool IsAddressOfOperand,
CorrectionCandidateCallback *CCC,
- bool IsInlineAsmIdentifier, Token *KeywordReplacement) {
+ bool IsInlineAsmIdentifier) {
assert(!(IsAddressOfOperand && HasTrailingLParen) &&
"cannot be direct & operand and have a trailing lparen");
if (SS.isInvalid())
More information about the cfe-commits
mailing list