[clang-tools-extra] [clang-tidy][NFC] Apply const-correctness for auto 2/N (PR #213840)
Baranov Victor via cfe-commits
cfe-commits at lists.llvm.org
Mon Aug 3 22:26:33 PDT 2026
https://github.com/vbvictor created https://github.com/llvm/llvm-project/pull/213840
None
>From 5c94c0e298377eee909eeed292e2c16e24361ed4 Mon Sep 17 00:00:00 2001
From: Victor Baranov <bar.victor.2002 at gmail.com>
Date: Tue, 4 Aug 2026 08:25:30 +0300
Subject: [PATCH] [clang-tidy][NFC] Apply const-correctness for auto 2/N
---
clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h | 2 +-
.../clang-tidy/abseil/CleanupCtadCheck.cpp | 5 +++--
.../clang-tidy/abseil/DurationComparisonCheck.cpp | 8 ++++----
.../abseil/DurationConversionCastCheck.cpp | 2 +-
.../clang-tidy/abseil/DurationRewriter.cpp | 6 +++---
.../abseil/DurationUnnecessaryConversionCheck.cpp | 2 +-
.../abseil/FasterStrsplitDelimiterCheck.cpp | 2 +-
.../clang-tidy/abseil/StringFindStartswithCheck.cpp | 12 ++++++------
.../clang-tidy/abseil/StringFindStrContainsCheck.cpp | 12 ++++++------
.../clang-tidy/abseil/TimeComparisonCheck.cpp | 2 +-
.../clang-tidy/abseil/TimeSubtractionCheck.cpp | 6 +++---
.../abseil/UncheckedStatusOrAccessCheck.cpp | 2 +-
.../altera/IdDependentBackwardBranchCheck.cpp | 4 ++--
.../clang-tidy/altera/SingleWorkItemBarrierCheck.cpp | 2 +-
.../clang-tidy/altera/StructPackAlignCheck.cpp | 2 +-
.../clang-tidy/android/CloexecAccept4Check.cpp | 5 +++--
.../clang-tidy/android/CloexecAcceptCheck.cpp | 5 +++--
.../clang-tidy/android/CloexecCreatCheck.cpp | 4 ++--
.../clang-tidy/android/CloexecFopenCheck.cpp | 2 +-
.../clang-tidy/android/CloexecMemfdCreateCheck.cpp | 2 +-
.../clang-tidy/android/CloexecOpenCheck.cpp | 2 +-
.../clang-tidy/boost/UseToStringCheck.cpp | 6 +++---
clang-tools-extra/clang-tidy/custom/QueryCheck.cpp | 9 +++++----
.../google/AvoidThrowingObjCExceptionCheck.cpp | 7 ++++---
.../google/GlobalVariableDeclarationCheck.cpp | 5 +++--
.../clang-tidy/google/IntegerTypesCheck.cpp | 6 +++---
.../clang-tidy/google/UpgradeGoogletestCaseCheck.cpp | 10 +++++-----
.../clang-tidy/linuxkernel/MustCheckErrsCheck.cpp | 9 +++++----
28 files changed, 74 insertions(+), 67 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h b/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h
index 86746bfac0257..3f24603988801 100644
--- a/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h
+++ b/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h
@@ -33,7 +33,7 @@ namespace clang::ast_matchers {
AST_POLYMORPHIC_MATCHER(
isInAbseilFile, AST_POLYMORPHIC_SUPPORTED_TYPES(Decl, Stmt, TypeLoc,
NestedNameSpecifierLoc)) {
- auto &SourceManager = Finder->getASTContext().getSourceManager();
+ const auto &SourceManager = Finder->getASTContext().getSourceManager();
const SourceLocation Loc = SourceManager.getSpellingLoc(Node.getBeginLoc());
if (Loc.isInvalid())
return false;
diff --git a/clang-tools-extra/clang-tidy/abseil/CleanupCtadCheck.cpp b/clang-tools-extra/clang-tidy/abseil/CleanupCtadCheck.cpp
index dd20ad8a4c269..7053309dd26f8 100644
--- a/clang-tools-extra/clang-tidy/abseil/CleanupCtadCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/CleanupCtadCheck.cpp
@@ -19,8 +19,9 @@ using namespace ::clang::transformer;
namespace clang::tidy::abseil {
static RewriteRuleWith<std::string> cleanupCtadCheckImpl() {
- auto WarningMessage = cat("prefer absl::Cleanup's class template argument "
- "deduction pattern in C++17 and higher");
+ const auto WarningMessage =
+ cat("prefer absl::Cleanup's class template argument "
+ "deduction pattern in C++17 and higher");
return makeRule(
declStmt(hasSingleDecl(varDecl(
diff --git a/clang-tools-extra/clang-tidy/abseil/DurationComparisonCheck.cpp b/clang-tools-extra/clang-tidy/abseil/DurationComparisonCheck.cpp
index f00877754f952..c2dce68b4569e 100644
--- a/clang-tools-extra/clang-tidy/abseil/DurationComparisonCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/DurationComparisonCheck.cpp
@@ -16,10 +16,10 @@ using namespace clang::ast_matchers;
namespace clang::tidy::abseil {
void DurationComparisonCheck::registerMatchers(MatchFinder *Finder) {
- auto Matcher = expr(comparisonOperatorWithCallee(functionDecl(
- functionDecl(durationConversionFunction())
- .bind("function_decl"))))
- .bind("binop");
+ const auto Matcher = expr(comparisonOperatorWithCallee(functionDecl(
+ functionDecl(durationConversionFunction())
+ .bind("function_decl"))))
+ .bind("binop");
Finder->addMatcher(Matcher, this);
}
diff --git a/clang-tools-extra/clang-tidy/abseil/DurationConversionCastCheck.cpp b/clang-tools-extra/clang-tidy/abseil/DurationConversionCastCheck.cpp
index ae2cf5b4cb642..77601b3c2d700 100644
--- a/clang-tools-extra/clang-tidy/abseil/DurationConversionCastCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/DurationConversionCastCheck.cpp
@@ -18,7 +18,7 @@ using namespace clang::ast_matchers;
namespace clang::tidy::abseil {
void DurationConversionCastCheck::registerMatchers(MatchFinder *Finder) {
- auto CallMatcher = ignoringImpCasts(callExpr(
+ const auto CallMatcher = ignoringImpCasts(callExpr(
callee(functionDecl(durationConversionFunction()).bind("func_decl")),
hasArgument(0, expr().bind("arg"))));
diff --git a/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp b/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp
index 035e7d642c8b7..388b3b71baf43 100644
--- a/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp
@@ -111,7 +111,7 @@ StringRef getTimeInverseForScale(DurationScale Scale) {
/// Returns `true` if `Node` is a value which evaluates to a literal `0`.
bool isLiteralZero(const MatchFinder::MatchResult &Result, const Expr &Node) {
- auto ZeroMatcher =
+ const auto ZeroMatcher =
anyOf(integerLiteral(equals(0)), floatLiteral(equals(0.0)));
// Check to see if we're using a zero directly.
@@ -196,7 +196,7 @@ std::optional<DurationScale> getScaleForDurationInverse(StringRef Name) {
{"ToDoubleNanoseconds", DurationScale::Nanoseconds},
{"ToInt64Nanoseconds", DurationScale::Nanoseconds}});
- auto ScaleIter = ScaleMap.find(Name);
+ const auto ScaleIter = ScaleMap.find(Name);
if (ScaleIter == ScaleMap.end())
return std::nullopt;
@@ -212,7 +212,7 @@ std::optional<DurationScale> getScaleForTimeInverse(StringRef Name) {
{"ToUnixMicros", DurationScale::Microseconds},
{"ToUnixNanos", DurationScale::Nanoseconds}});
- auto ScaleIter = ScaleMap.find(Name);
+ const auto ScaleIter = ScaleMap.find(Name);
if (ScaleIter == ScaleMap.end())
return std::nullopt;
diff --git a/clang-tools-extra/clang-tidy/abseil/DurationUnnecessaryConversionCheck.cpp b/clang-tools-extra/clang-tidy/abseil/DurationUnnecessaryConversionCheck.cpp
index 5867fb630315d..9e11d262b5290 100644
--- a/clang-tools-extra/clang-tidy/abseil/DurationUnnecessaryConversionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/DurationUnnecessaryConversionCheck.cpp
@@ -27,7 +27,7 @@ void DurationUnnecessaryConversionCheck::registerMatchers(MatchFinder *Finder) {
// Matcher which matches the current scale's factory with a `1` argument,
// e.g. `absl::Seconds(1)`.
- auto FactoryMatcher = ignoringElidableConstructorCall(
+ const auto FactoryMatcher = ignoringElidableConstructorCall(
callExpr(callee(functionDecl(hasName(DurationFactory))),
hasArgument(0, ignoringImpCasts(integerLiteral(equals(1))))));
diff --git a/clang-tools-extra/clang-tidy/abseil/FasterStrsplitDelimiterCheck.cpp b/clang-tools-extra/clang-tidy/abseil/FasterStrsplitDelimiterCheck.cpp
index 391777225f739..e6ac0b5308398 100644
--- a/clang-tools-extra/clang-tidy/abseil/FasterStrsplitDelimiterCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/FasterStrsplitDelimiterCheck.cpp
@@ -62,7 +62,7 @@ void FasterStrsplitDelimiterCheck::registerMatchers(MatchFinder *Finder) {
// Binds to a string_view (either absl or std) that was passed by value and
// constructed from string literal.
- auto StringViewArg = ignoringElidableConstructorCall(ignoringImpCasts(
+ const auto StringViewArg = ignoringElidableConstructorCall(ignoringImpCasts(
cxxConstructExpr(hasType(recordDecl(hasName("::absl::string_view"))),
hasArgument(0, ignoringParenImpCasts(SingleChar)))));
diff --git a/clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp b/clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp
index e1063c4f8a46e..5bd328a3cc7af 100644
--- a/clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp
@@ -34,12 +34,12 @@ StringFindStartswithCheck::StringFindStartswithCheck(StringRef Name,
Options.get("AbseilStringsMatchHeader", "absl/strings/match.h")) {}
void StringFindStartswithCheck::registerMatchers(MatchFinder *Finder) {
- auto ZeroLiteral = integerLiteral(equals(0));
- auto StringClassMatcher = cxxRecordDecl(hasAnyName(StringLikeClasses));
- auto StringType = hasUnqualifiedDesugaredType(
+ const auto ZeroLiteral = integerLiteral(equals(0));
+ const auto StringClassMatcher = cxxRecordDecl(hasAnyName(StringLikeClasses));
+ const auto StringType = hasUnqualifiedDesugaredType(
recordType(hasDeclaration(StringClassMatcher)));
- auto StringFind = cxxMemberCallExpr(
+ const auto StringFind = cxxMemberCallExpr(
// .find()-call on a string...
callee(cxxMethodDecl(hasName("find")).bind("findfun")),
on(hasType(StringType)),
@@ -57,7 +57,7 @@ void StringFindStartswithCheck::registerMatchers(MatchFinder *Finder) {
.bind("expr"),
this);
- auto StringRFind = cxxMemberCallExpr(
+ const auto StringRFind = cxxMemberCallExpr(
// .rfind()-call on a string...
callee(cxxMethodDecl(hasName("rfind")).bind("findfun")),
on(hasType(StringType)),
@@ -110,7 +110,7 @@ void StringFindStartswithCheck::check(const MatchFinder::MatchResult &Result) {
const bool Neg = ComparisonExpr->getOpcode() == BO_NE;
// Create the warning message and a FixIt hint replacing the original expr.
- auto Diagnostic =
+ const auto Diagnostic =
diag(ComparisonExpr->getBeginLoc(),
"use %select{absl::StartsWith|!absl::StartsWith}0 "
"instead of %select{find()|rfind()}1 %select{==|!=}0 0")
diff --git a/clang-tools-extra/clang-tidy/abseil/StringFindStrContainsCheck.cpp b/clang-tools-extra/clang-tidy/abseil/StringFindStrContainsCheck.cpp
index 5b31c002fce2b..e02263a81f47e 100644
--- a/clang-tools-extra/clang-tidy/abseil/StringFindStrContainsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/StringFindStrContainsCheck.cpp
@@ -42,15 +42,15 @@ static constexpr char DefaultAbseilStringsMatchHeader[] =
static transformer::RewriteRuleWith<std::string>
makeRewriteRule(ArrayRef<StringRef> StringLikeClassNames,
StringRef AbseilStringsMatchHeader) {
- auto StringLikeClass = cxxRecordDecl(hasAnyName(StringLikeClassNames));
- auto StringType =
+ const auto StringLikeClass = cxxRecordDecl(hasAnyName(StringLikeClassNames));
+ const auto StringType =
hasUnqualifiedDesugaredType(recordType(hasDeclaration(StringLikeClass)));
- auto CharStarType =
+ const auto CharStarType =
hasUnqualifiedDesugaredType(pointerType(pointee(isAnyCharacter())));
- auto CharType = hasUnqualifiedDesugaredType(isCharType());
- auto StringNpos = declRefExpr(
+ const auto CharType = hasUnqualifiedDesugaredType(isCharType());
+ const auto StringNpos = declRefExpr(
to(varDecl(hasName("npos"), hasDeclContext(StringLikeClass))));
- auto StringFind = cxxMemberCallExpr(
+ const auto StringFind = cxxMemberCallExpr(
callee(cxxMethodDecl(
hasName("find"), parameterCountIs(2),
hasParameter(
diff --git a/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.cpp b/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.cpp
index 5d80b16239838..7f3bc9b783308 100644
--- a/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/TimeComparisonCheck.cpp
@@ -16,7 +16,7 @@ using namespace clang::ast_matchers;
namespace clang::tidy::abseil {
void TimeComparisonCheck::registerMatchers(MatchFinder *Finder) {
- auto Matcher =
+ const auto Matcher =
expr(comparisonOperatorWithCallee(functionDecl(
functionDecl(timeConversionFunction()).bind("function_decl"))))
.bind("binop");
diff --git a/clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.cpp b/clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.cpp
index b7d5cf69fdf68..e93bd54921430 100644
--- a/clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/TimeSubtractionCheck.cpp
@@ -97,7 +97,7 @@ void TimeSubtractionCheck::registerMatchers(MatchFinder *Finder) {
std::optional<DurationScale> Scale = getScaleForTimeInverse(TimeInverse);
assert(Scale && "Unknown scale encountered");
- auto TimeInverseMatcher = callExpr(callee(
+ const auto TimeInverseMatcher = callExpr(callee(
functionDecl(hasName((llvm::Twine("::absl::") + TimeInverse).str()))
.bind("func_decl")));
@@ -106,7 +106,7 @@ void TimeSubtractionCheck::registerMatchers(MatchFinder *Finder) {
// is not sufficient, since the second operand could be either a 'Time' or
// a 'Duration'. If we know the result is a 'Duration', we can then infer
// that the second operand must be a 'Time'.
- auto CallMatcher =
+ const auto CallMatcher =
callExpr(
callee(functionDecl(hasName(getDurationFactoryForScale(*Scale)))),
hasArgument(0, binaryOperator(hasOperatorName("-"),
@@ -118,7 +118,7 @@ void TimeSubtractionCheck::registerMatchers(MatchFinder *Finder) {
// Match cases where we know the second operand is a 'Time'. Since
// subtracting a 'Time' from a 'Duration' is not defined, in these cases,
// we always know the first operand is a 'Time' if the second is a 'Time'.
- auto OperandMatcher =
+ const auto OperandMatcher =
binaryOperator(hasOperatorName("-"), hasRHS(TimeInverseMatcher))
.bind("binop");
Finder->addMatcher(OperandMatcher, this);
diff --git a/clang-tools-extra/clang-tidy/abseil/UncheckedStatusOrAccessCheck.cpp b/clang-tools-extra/clang-tidy/abseil/UncheckedStatusOrAccessCheck.cpp
index 3dcdbd37e7795..c0e9b39144ea4 100644
--- a/clang-tools-extra/clang-tidy/abseil/UncheckedStatusOrAccessCheck.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/UncheckedStatusOrAccessCheck.cpp
@@ -26,7 +26,7 @@ static constexpr StringRef FuncID = "fun";
void UncheckedStatusOrAccessCheck::registerMatchers(MatchFinder *Finder) {
using namespace ast_matchers;
- auto HasStatusOrCallDescendant =
+ const auto HasStatusOrCallDescendant =
hasDescendant(callExpr(callee(cxxMethodDecl(ofClass(hasAnyName(
"absl::StatusOr", "absl::internal_statusor::OperatorBase"))))));
Finder->addMatcher(
diff --git a/clang-tools-extra/clang-tidy/altera/IdDependentBackwardBranchCheck.cpp b/clang-tools-extra/clang-tidy/altera/IdDependentBackwardBranchCheck.cpp
index 82a02dd6e9344..d33b6677b86b1 100644
--- a/clang-tools-extra/clang-tidy/altera/IdDependentBackwardBranchCheck.cpp
+++ b/clang-tools-extra/clang-tidy/altera/IdDependentBackwardBranchCheck.cpp
@@ -89,7 +89,7 @@ IdDependentBackwardBranchCheck::hasIdDepVar(const Expr *Expression) {
dyn_cast_if_present<VarDecl>(Declaration->getDecl());
if (!CheckVariable)
return nullptr;
- auto FoundVariable = IdDepVarsMap.find(CheckVariable);
+ const auto FoundVariable = IdDepVarsMap.find(CheckVariable);
if (FoundVariable == IdDepVarsMap.end())
return nullptr;
return &(FoundVariable->second);
@@ -111,7 +111,7 @@ IdDependentBackwardBranchCheck::hasIdDepField(const Expr *Expression) {
dyn_cast_if_present<FieldDecl>(MemberExpression->getMemberDecl());
if (!CheckField)
return nullptr;
- auto FoundField = IdDepFieldsMap.find(CheckField);
+ const auto FoundField = IdDepFieldsMap.find(CheckField);
if (FoundField == IdDepFieldsMap.end())
return nullptr;
return &(FoundField->second);
diff --git a/clang-tools-extra/clang-tidy/altera/SingleWorkItemBarrierCheck.cpp b/clang-tools-extra/clang-tidy/altera/SingleWorkItemBarrierCheck.cpp
index c9df658d9bd67..22abf51c52879 100644
--- a/clang-tools-extra/clang-tidy/altera/SingleWorkItemBarrierCheck.cpp
+++ b/clang-tools-extra/clang-tidy/altera/SingleWorkItemBarrierCheck.cpp
@@ -54,7 +54,7 @@ void SingleWorkItemBarrierCheck::check(const MatchFinder::MatchResult &Result) {
bool IsNDRange = false;
if (MatchedDecl->hasAttr<ReqdWorkGroupSizeAttr>()) {
const auto *Attribute = MatchedDecl->getAttr<ReqdWorkGroupSizeAttr>();
- auto Eval = [&](Expr *E) {
+ const auto Eval = [&](Expr *E) {
return E->EvaluateKnownConstInt(MatchedDecl->getASTContext())
.getExtValue();
};
diff --git a/clang-tools-extra/clang-tidy/altera/StructPackAlignCheck.cpp b/clang-tools-extra/clang-tidy/altera/StructPackAlignCheck.cpp
index 4a12a44bbbf79..36b4199d02e09 100644
--- a/clang-tools-extra/clang-tidy/altera/StructPackAlignCheck.cpp
+++ b/clang-tools-extra/clang-tidy/altera/StructPackAlignCheck.cpp
@@ -107,7 +107,7 @@ void StructPackAlignCheck::check(const MatchFinder::MatchResult &Result) {
}
FixItHint FixIt;
- auto *Attribute = Struct->getAttr<AlignedAttr>();
+ const auto *Attribute = Struct->getAttr<AlignedAttr>();
const std::string NewAlignQuantity = std::to_string(NewAlign.getQuantity());
if (Attribute) {
FixIt = FixItHint::CreateReplacement(
diff --git a/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.cpp b/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.cpp
index 8cf22ba2acb4a..7f8616c1cddbd 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecAccept4Check.cpp
@@ -14,9 +14,10 @@ using namespace clang::ast_matchers;
namespace clang::tidy::android {
void CloexecAccept4Check::registerMatchers(MatchFinder *Finder) {
- auto SockAddrPointerType =
+ const auto SockAddrPointerType =
hasType(pointsTo(recordDecl(isStruct(), hasName("sockaddr"))));
- auto SockLenPointerType = hasType(pointsTo(namedDecl(hasName("socklen_t"))));
+ const auto SockLenPointerType =
+ hasType(pointsTo(namedDecl(hasName("socklen_t"))));
registerMatchersImpl(Finder,
functionDecl(returns(isInteger()), hasName("accept4"),
diff --git a/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.cpp b/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.cpp
index a624523b18137..216d97043ce32 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecAcceptCheck.cpp
@@ -14,9 +14,10 @@ using namespace clang::ast_matchers;
namespace clang::tidy::android {
void CloexecAcceptCheck::registerMatchers(MatchFinder *Finder) {
- auto SockAddrPointerType =
+ const auto SockAddrPointerType =
hasType(pointsTo(recordDecl(isStruct(), hasName("sockaddr"))));
- auto SockLenPointerType = hasType(pointsTo(namedDecl(hasName("socklen_t"))));
+ const auto SockLenPointerType =
+ hasType(pointsTo(namedDecl(hasName("socklen_t"))));
registerMatchersImpl(Finder,
functionDecl(returns(isInteger()), hasName("accept"),
diff --git a/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.cpp b/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.cpp
index ae44efb629893..a43a0768c03f1 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecCreatCheck.cpp
@@ -14,8 +14,8 @@ using namespace clang::ast_matchers;
namespace clang::tidy::android {
void CloexecCreatCheck::registerMatchers(MatchFinder *Finder) {
- auto CharPointerType = hasType(pointerType(pointee(isAnyCharacter())));
- auto MODETType = hasType(namedDecl(hasName("mode_t")));
+ const auto CharPointerType = hasType(pointerType(pointee(isAnyCharacter())));
+ const auto MODETType = hasType(namedDecl(hasName("mode_t")));
registerMatchersImpl(Finder, functionDecl(isExternC(), returns(isInteger()),
hasName("creat"),
hasParameter(0, CharPointerType),
diff --git a/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.cpp b/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.cpp
index 8ddd6a0523156..06521f87119a3 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecFopenCheck.cpp
@@ -14,7 +14,7 @@ using namespace clang::ast_matchers;
namespace clang::tidy::android {
void CloexecFopenCheck::registerMatchers(MatchFinder *Finder) {
- auto CharPointerType = hasType(pointerType(pointee(isAnyCharacter())));
+ const auto CharPointerType = hasType(pointerType(pointee(isAnyCharacter())));
registerMatchersImpl(
Finder, functionDecl(isExternC(), returns(asString("FILE *")),
hasName("fopen"), hasParameter(0, CharPointerType),
diff --git a/clang-tools-extra/clang-tidy/android/CloexecMemfdCreateCheck.cpp b/clang-tools-extra/clang-tidy/android/CloexecMemfdCreateCheck.cpp
index 5ecf908aabb59..97f20ee7f3310 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecMemfdCreateCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecMemfdCreateCheck.cpp
@@ -13,7 +13,7 @@ using namespace clang::ast_matchers;
namespace clang::tidy::android {
void CloexecMemfdCreateCheck::registerMatchers(MatchFinder *Finder) {
- auto CharPointerType = hasType(pointerType(pointee(isAnyCharacter())));
+ const auto CharPointerType = hasType(pointerType(pointee(isAnyCharacter())));
registerMatchersImpl(
Finder, functionDecl(returns(isInteger()), hasName("memfd_create"),
hasParameter(0, CharPointerType),
diff --git a/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.cpp b/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.cpp
index 9938027c53b0e..7c70f1a71a79f 100644
--- a/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.cpp
+++ b/clang-tools-extra/clang-tidy/android/CloexecOpenCheck.cpp
@@ -14,7 +14,7 @@ using namespace clang::ast_matchers;
namespace clang::tidy::android {
void CloexecOpenCheck::registerMatchers(MatchFinder *Finder) {
- auto CharPointerType = hasType(pointerType(pointee(isAnyCharacter())));
+ const auto CharPointerType = hasType(pointerType(pointee(isAnyCharacter())));
registerMatchersImpl(Finder,
functionDecl(isExternC(), returns(isInteger()),
hasAnyName("open", "open64"),
diff --git a/clang-tools-extra/clang-tidy/boost/UseToStringCheck.cpp b/clang-tools-extra/clang-tidy/boost/UseToStringCheck.cpp
index 3574108ee5697..011ffaff7ca12 100644
--- a/clang-tools-extra/clang-tidy/boost/UseToStringCheck.cpp
+++ b/clang-tools-extra/clang-tidy/boost/UseToStringCheck.cpp
@@ -37,7 +37,7 @@ void UseToStringCheck::registerMatchers(MatchFinder *Finder) {
void UseToStringCheck::check(const MatchFinder::MatchResult &Result) {
const auto *Call = Result.Nodes.getNodeAs<CallExpr>("to_string");
- auto CharType =
+ const auto CharType =
Result.Nodes.getNodeAs<TemplateArgument>("char_type")->getAsType();
StringRef StringType;
@@ -50,8 +50,8 @@ void UseToStringCheck::check(const MatchFinder::MatchResult &Result) {
else
return;
- auto Loc = Call->getBeginLoc();
- auto Diag =
+ const auto Loc = Call->getBeginLoc();
+ const auto Diag =
diag(Loc, "use std::to_%0 instead of boost::lexical_cast<std::%0>")
<< StringType;
diff --git a/clang-tools-extra/clang-tidy/custom/QueryCheck.cpp b/clang-tools-extra/clang-tidy/custom/QueryCheck.cpp
index 60f2f91708c7b..a77a6c664c6ce 100644
--- a/clang-tools-extra/clang-tidy/custom/QueryCheck.cpp
+++ b/clang-tools-extra/clang-tidy/custom/QueryCheck.cpp
@@ -104,12 +104,12 @@ QueryCheck::QueryCheck(StringRef Name,
ClangTidyContext *Context)
: ClangTidyCheck(Name, Context) {
for (const ClangTidyOptions::CustomCheckDiag &D : V.Diags) {
- auto DiagnosticIdIt =
+ const auto DiagnosticIdIt =
Diags
.try_emplace(D.Level.value_or(DiagnosticIDs::Warning),
llvm::StringMap<SmallVector<std::string>>{})
.first;
- auto DiagMessageIt =
+ const auto DiagMessageIt =
DiagnosticIdIt->getSecond()
.try_emplace(D.BindName, SmallVector<std::string>{})
.first;
@@ -124,8 +124,9 @@ void QueryCheck::registerMatchers(MatchFinder *Finder) {
}
void QueryCheck::check(const MatchFinder::MatchResult &Result) {
- auto Emit = [this](const DiagMaps &DiagMaps, const std::string &BindName,
- const DynTypedNode &Node, DiagnosticIDs::Level Level) {
+ const auto Emit = [this](
+ const DiagMaps &DiagMaps, const std::string &BindName,
+ const DynTypedNode &Node, DiagnosticIDs::Level Level) {
const DiagMaps::const_iterator DiagMapIt = DiagMaps.find(Level);
if (DiagMapIt == DiagMaps.end())
return;
diff --git a/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp b/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp
index 92d590cb394c3..97147dcd64ada 100644
--- a/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/AvoidThrowingObjCExceptionCheck.cpp
@@ -29,8 +29,9 @@ void AvoidThrowingObjCExceptionCheck::check(
Result.Nodes.getNodeAs<ObjCAtThrowStmt>("throwStmt");
const auto *MatchedExpr =
Result.Nodes.getNodeAs<ObjCMessageExpr>("raiseException");
- auto SourceLoc = MatchedStmt == nullptr ? MatchedExpr->getSelectorStartLoc()
- : MatchedStmt->getThrowLoc();
+ const auto SourceLoc = MatchedStmt == nullptr
+ ? MatchedExpr->getSelectorStartLoc()
+ : MatchedStmt->getThrowLoc();
// Early return on invalid locations.
if (SourceLoc.isInvalid())
@@ -40,7 +41,7 @@ void AvoidThrowingObjCExceptionCheck::check(
// header.
if (SourceLoc.isMacroID()) {
const SourceManager &SM = *Result.SourceManager;
- auto MacroLoc = SM.getImmediateMacroCallerLoc(SourceLoc);
+ const auto MacroLoc = SM.getImmediateMacroCallerLoc(SourceLoc);
// Matches in system header macros should be ignored.
if (SM.isInSystemHeader(MacroLoc))
diff --git a/clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp b/clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp
index ec4fe724fcf58..debc31f775273 100644
--- a/clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp
@@ -46,8 +46,9 @@ static FixItHint generateFixItHint(const VarDecl *Decl, bool IsConst) {
return {};
}
- auto NewName = (IsConst ? "k" : "g") + StringRef(std::string(1, FC)).upper() +
- Decl->getName().substr(1).str();
+ const auto NewName = (IsConst ? "k" : "g") +
+ StringRef(std::string(1, FC)).upper() +
+ Decl->getName().substr(1).str();
return FixItHint::CreateReplacement(
CharSourceRange::getTokenRange(SourceRange(Decl->getLocation())),
diff --git a/clang-tools-extra/clang-tidy/google/IntegerTypesCheck.cpp b/clang-tools-extra/clang-tidy/google/IntegerTypesCheck.cpp
index 52bcf1b1719a4..2ac57e988b08e 100644
--- a/clang-tools-extra/clang-tidy/google/IntegerTypesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/IntegerTypesCheck.cpp
@@ -48,7 +48,7 @@ AST_MATCHER(TypeLoc, isValidAndNotInMacro) {
AST_MATCHER(TypeLoc, isBuiltinType) {
TypeLoc TL = Node;
- if (auto QualLoc = Node.getAs<QualifiedTypeLoc>())
+ if (const auto QualLoc = Node.getAs<QualifiedTypeLoc>())
TL = QualLoc.getUnqualifiedLoc();
const auto BuiltinLoc = TL.getAs<BuiltinTypeLoc>();
@@ -106,10 +106,10 @@ void IntegerTypesCheck::check(const MatchFinder::MatchResult &Result) {
const SourceLocation Loc = TL.getBeginLoc();
// Look through qualification.
- if (auto QualLoc = TL.getAs<QualifiedTypeLoc>())
+ if (const auto QualLoc = TL.getAs<QualifiedTypeLoc>())
TL = QualLoc.getUnqualifiedLoc();
- auto BuiltinLoc = TL.getAs<BuiltinTypeLoc>();
+ const auto BuiltinLoc = TL.getAs<BuiltinTypeLoc>();
if (!BuiltinLoc)
return;
diff --git a/clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp b/clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp
index a5124ad784a2f..2f8f16cb14563 100644
--- a/clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp
@@ -124,14 +124,14 @@ void UpgradeGoogletestCaseCheck::registerPPCallbacks(const SourceManager &,
}
void UpgradeGoogletestCaseCheck::registerMatchers(MatchFinder *Finder) {
- auto LocationFilter =
+ const auto LocationFilter =
unless(isExpansionInFileMatching("gtest/gtest(-typed-test)?\\.h$"));
// Matchers for the member functions that are being renamed. In each matched
// Google Test class, we check for the existence of one new method name. This
// makes sure the check gives warnings only if the included version of Google
// Test is recent enough.
- auto Methods =
+ const auto Methods =
cxxMethodDecl(
anyOf(
cxxMethodDecl(
@@ -181,7 +181,7 @@ void UpgradeGoogletestCaseCheck::registerMatchers(MatchFinder *Finder) {
// Matchers for `TestCase` -> `TestSuite`. The fact that `TestCase` is an
// alias and not a class declaration ensures we only match with a recent
// enough version of Google Test.
- auto TestCaseTypeAlias =
+ const auto TestCaseTypeAlias =
typeAliasDecl(hasName("::testing::TestCase")).bind("test-case");
Finder->addMatcher(
typeLoc(loc(qualType(typedefType(hasDeclaration(TestCaseTypeAlias)))),
@@ -254,10 +254,10 @@ getAliasNameRange(const MatchFinder::MatchResult &Result) {
Using->getNameInfo().getSourceRange());
}
TypeLoc TL = *Result.Nodes.getNodeAs<TypeLoc>("typeloc");
- if (auto QTL = TL.getAs<QualifiedTypeLoc>())
+ if (const auto QTL = TL.getAs<QualifiedTypeLoc>())
TL = QTL.getUnqualifiedLoc();
- if (auto TTL = TL.getAs<TypedefTypeLoc>())
+ if (const auto TTL = TL.getAs<TypedefTypeLoc>())
return CharSourceRange::getTokenRange(TTL.getNameLoc());
return CharSourceRange::getTokenRange(TL.castAs<UsingTypeLoc>().getNameLoc());
}
diff --git a/clang-tools-extra/clang-tidy/linuxkernel/MustCheckErrsCheck.cpp b/clang-tools-extra/clang-tidy/linuxkernel/MustCheckErrsCheck.cpp
index 14f54571885f2..67c0425d9c7d4 100644
--- a/clang-tools-extra/clang-tidy/linuxkernel/MustCheckErrsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/linuxkernel/MustCheckErrsCheck.cpp
@@ -14,15 +14,16 @@ using namespace clang::ast_matchers;
namespace clang::tidy::linuxkernel {
void MustCheckErrsCheck::registerMatchers(MatchFinder *Finder) {
- auto ErrFn =
+ const auto ErrFn =
functionDecl(hasAnyName("ERR_PTR", "PTR_ERR", "IS_ERR", "IS_ERR_OR_NULL",
"ERR_CAST", "PTR_ERR_OR_ZERO"));
- auto NonCheckingStmts = stmt(anyOf(compoundStmt(), labelStmt()));
+ const auto NonCheckingStmts = stmt(anyOf(compoundStmt(), labelStmt()));
Finder->addMatcher(
callExpr(callee(ErrFn), hasParent(NonCheckingStmts)).bind("call"), this);
- auto ReturnToCheck = returnStmt(hasReturnValue(callExpr(callee(ErrFn))));
- auto ReturnsErrFn = functionDecl(hasDescendant(ReturnToCheck));
+ const auto ReturnToCheck =
+ returnStmt(hasReturnValue(callExpr(callee(ErrFn))));
+ const auto ReturnsErrFn = functionDecl(hasDescendant(ReturnToCheck));
Finder->addMatcher(callExpr(callee(ReturnsErrFn), hasParent(NonCheckingStmts))
.bind("transitive_call"),
this);
More information about the cfe-commits
mailing list