Author: Thomas Schenker Date: 2024-07-23T07:38:49Z New Revision: 26c99c421794902b0d929fd9eff81314da55675c
URL: https://github.com/llvm/llvm-project/commit/26c99c421794902b0d929fd9eff81314da55675c DIFF: https://github.com/llvm/llvm-project/commit/26c99c421794902b0d929fd9eff81314da55675c.diff LOG: [clang-tidy] fix misc-const-correctness to work with function-try-blocks (#99925) Make the clang-tidy check misc-const-correctness work with function-try-blocks. Fixes #99860. Added: Modified: clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.cpp clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.h clang-tools-extra/docs/ReleaseNotes.rst clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.cpp b/clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.cpp index 8b500de0c028c..e20cf6fbcb55a 100644 --- a/clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.cpp @@ -93,13 +93,12 @@ void ConstCorrectnessCheck::registerMatchers(MatchFinder *Finder) { // shall be run. const auto FunctionScope = functionDecl( - hasBody( - compoundStmt(forEachDescendant( - declStmt(containsAnyDeclaration( - LocalValDecl.bind("local-value")), - unless(has(decompositionDecl()))) - .bind("decl-stmt"))) - .bind("scope"))) + hasBody(stmt(forEachDescendant( + declStmt(containsAnyDeclaration( + LocalValDecl.bind("local-value")), + unless(has(decompositionDecl()))) + .bind("decl-stmt"))) + .bind("scope"))) .bind("function-decl"); Finder->addMatcher(FunctionScope, this); @@ -109,7 +108,7 @@ void ConstCorrectnessCheck::registerMatchers(MatchFinder *Finder) { enum class VariableCategory { Value, Reference, Pointer }; void ConstCorrectnessCheck::check(const MatchFinder::MatchResult &Result) { - const auto *LocalScope = Result.Nodes.getNodeAs<CompoundStmt>("scope"); + const auto *LocalScope = Result.Nodes.getNodeAs<Stmt>("scope"); const auto *Variable = Result.Nodes.getNodeAs<VarDecl>("local-value"); const auto *Function = Result.Nodes.getNodeAs<FunctionDecl>("function-decl"); @@ -198,7 +197,7 @@ void ConstCorrectnessCheck::check(const MatchFinder::MatchResult &Result) { } } -void ConstCorrectnessCheck::registerScope(const CompoundStmt *LocalScope, +void ConstCorrectnessCheck::registerScope(const Stmt *LocalScope, ASTContext *Context) { auto &Analyzer = ScopesCache[LocalScope]; if (!Analyzer) diff --git a/clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.h b/clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.h index 08ffde524522a..bba060e555d00 100644 --- a/clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.h +++ b/clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.h @@ -32,10 +32,10 @@ class ConstCorrectnessCheck : public ClangTidyCheck { void check(const ast_matchers::MatchFinder::MatchResult &Result) override; private: - void registerScope(const CompoundStmt *LocalScope, ASTContext *Context); + void registerScope(const Stmt *LocalScope, ASTContext *Context); using MutationAnalyzer = std::unique_ptr<ExprMutationAnalyzer>; - llvm::DenseMap<const CompoundStmt *, MutationAnalyzer> ScopesCache; + llvm::DenseMap<const Stmt *, MutationAnalyzer> ScopesCache; llvm::DenseSet<SourceLocation> TemplateDiagnosticsCache; const bool AnalyzeValues; diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index 0b2c04c23761c..083b098d05d4a 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -381,7 +381,8 @@ Changes in existing checks - Improved :doc:`misc-const-correctness <clang-tidy/checks/misc/const-correctness>` check by avoiding infinite recursion for recursive functions with forwarding reference parameters and reference - variables which refer to themselves. + variables which refer to themselves. Also adapted the check to work with + function-try-blocks. - Improved :doc:`misc-definitions-in-headers <clang-tidy/checks/misc/definitions-in-headers>` check by replacing the local diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp index cb6bfcc1dccba..2af4bfb0bd449 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp @@ -56,6 +56,15 @@ void some_function(double np_arg0, wchar_t np_arg1) { np_local6--; } +int function_try_block() try { + int p_local0 = 0; + // CHECK-MESSAGES: [[@LINE-1]]:3: warning: variable 'p_local0' of type 'int' can be declared 'const' + // CHECK-FIXES: int const p_local0 + return p_local0; +} catch (...) { + return 0; +} + void nested_scopes() { int p_local0 = 2; // CHECK-MESSAGES: [[@LINE-1]]:3: warning: variable 'p_local0' of type 'int' can be declared 'const' _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
