https://github.com/HerrCai0907 updated
https://github.com/llvm/llvm-project/pull/89076
>From 49b4cd16c7f22bf31239f9474bb68c81ed76f057 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0...@163.com>
Date: Wed, 17 Apr 2024 22:22:18 +0800
Subject: [PATCH 1/2] [clang-tidy] bugprone-lambda-function-name ignore macro
in captures
Fixes: #89065
---
.../clang-tidy/bugprone/LambdaFunctionNameCheck.cpp | 7 ++++---
clang-tools-extra/docs/ReleaseNotes.rst | 4 ++++
.../clang-tidy/checkers/bugprone/lambda-function-name.cpp | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp
index 5260a8b4ecb0ba..f3dbb8d1e70286 100644
--- a/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp
@@ -56,6 +56,8 @@ class MacroExpansionsWithFileAndLine : public PPCallbacks {
LambdaFunctionNameCheck::SourceRangeSet* SuppressMacroExpansions;
};
+AST_MATCHER(CXXMethodDecl, isInLambda) { return Node.getParent()->isLambda(); }
+
} // namespace
LambdaFunctionNameCheck::LambdaFunctionNameCheck(StringRef Name,
@@ -69,9 +71,8 @@ void
LambdaFunctionNameCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
}
void LambdaFunctionNameCheck::registerMatchers(MatchFinder *Finder) {
- // Match on PredefinedExprs inside a lambda.
- Finder->addMatcher(predefinedExpr(hasAncestor(lambdaExpr())).bind("E"),
- this);
+ auto IsInsideALambda = hasAncestor(cxxMethodDecl(isInLambda()));
+ Finder->addMatcher(predefinedExpr(IsInsideALambda).bind("E"), this);
}
void LambdaFunctionNameCheck::registerPPCallbacks(
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst
b/clang-tools-extra/docs/ReleaseNotes.rst
index 7095c564444fe6..d5d14cef130e97 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -151,6 +151,10 @@ Changes in existing checks
<clang-tidy/checks/bugprone/inc-dec-in-conditions>` check to ignore code
within unevaluated contexts, such as ``decltype``.
+- Improved :doc:`bugprone-lambda-function-name
+ <clang-tidy/checks/bugprone/lambda-function-name>` check by ignoring
+ ``__func__`` macro in lambda captures.
+
- Improved :doc:`bugprone-non-zero-enum-to-bool-conversion
<clang-tidy/checks/bugprone/non-zero-enum-to-bool-conversion>` check by
eliminating false positives resulting from direct usage of bitwise operators
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp
index 936ee87a856cd2..921deecdcc5ed7 100644
---
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp
+++
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp
@@ -19,6 +19,7 @@ void Positives() {
// CHECK-MESSAGES-NO-CONFIG: :[[@LINE-1]]:8: warning: inside a lambda,
'__FUNCTION__' expands to the name of the function call operator; consider
capturing the name of the enclosing function explicitly
[bugprone-lambda-function-name]
[] { EMBED_IN_ANOTHER_MACRO1; }();
// CHECK-MESSAGES-NO-CONFIG: :[[@LINE-1]]:8: warning: inside a lambda,
'__func__' expands to the name of the function call operator; consider
capturing the name of the enclosing function explicitly
[bugprone-lambda-function-name]
+ [func=__func__] { func; }();
}
#define FUNC_MACRO_WITH_FILE_AND_LINE Foo(__func__, __FILE__, __LINE__)
>From 855110a8a1ce76a6a817cbe29be173164f48093e Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0...@163.com>
Date: Thu, 18 Apr 2024 06:41:33 +0800
Subject: [PATCH 2/2] update matcher
---
.../clang-tidy/bugprone/LambdaFunctionNameCheck.cpp | 13 +++++++++++--
clang-tools-extra/docs/ReleaseNotes.rst | 2 +-
.../checkers/bugprone/lambda-function-name.cpp | 11 ++++++++++-
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp
index f3dbb8d1e70286..5393db1b0b3ae9 100644
--- a/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp
@@ -8,7 +8,9 @@
#include "LambdaFunctionNameCheck.h"
#include "clang/AST/ASTContext.h"
+#include "clang/AST/DeclCXX.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
+#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Lex/MacroInfo.h"
#include "clang/Lex/Preprocessor.h"
@@ -71,8 +73,13 @@ void
LambdaFunctionNameCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
}
void LambdaFunctionNameCheck::registerMatchers(MatchFinder *Finder) {
- auto IsInsideALambda = hasAncestor(cxxMethodDecl(isInLambda()));
- Finder->addMatcher(predefinedExpr(IsInsideALambda).bind("E"), this);
+ Finder->addMatcher(
+ functionDecl(cxxMethodDecl(isInLambda()),
+ hasBody(hasDescendant(expr(
+ predefinedExpr(hasAncestor(functionDecl().bind("fn")))
+ .bind("E")))),
+ functionDecl(equalsBoundNode("fn"))),
+ this);
}
void LambdaFunctionNameCheck::registerPPCallbacks(
@@ -82,6 +89,8 @@ void LambdaFunctionNameCheck::registerPPCallbacks(
}
void LambdaFunctionNameCheck::check(const MatchFinder::MatchResult &Result) {
+ const auto *FN = Result.Nodes.getNodeAs<FunctionDecl>("fn");
+ FN->dumpColor();
const auto *E = Result.Nodes.getNodeAs<PredefinedExpr>("E");
if (E->getIdentKind() != PredefinedIdentKind::Func &&
E->getIdentKind() != PredefinedIdentKind::Function) {
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst
b/clang-tools-extra/docs/ReleaseNotes.rst
index d5d14cef130e97..7c921be4b20201 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -153,7 +153,7 @@ Changes in existing checks
- Improved :doc:`bugprone-lambda-function-name
<clang-tidy/checks/bugprone/lambda-function-name>` check by ignoring
- ``__func__`` macro in lambda captures.
+ ``__func__`` macro in lambda captures and nested function declaration.
- Improved :doc:`bugprone-non-zero-enum-to-bool-conversion
<clang-tidy/checks/bugprone/non-zero-enum-to-bool-conversion>` check by
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp
index 921deecdcc5ed7..731923c4fcce19 100644
---
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp
+++
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp
@@ -19,7 +19,6 @@ void Positives() {
// CHECK-MESSAGES-NO-CONFIG: :[[@LINE-1]]:8: warning: inside a lambda,
'__FUNCTION__' expands to the name of the function call operator; consider
capturing the name of the enclosing function explicitly
[bugprone-lambda-function-name]
[] { EMBED_IN_ANOTHER_MACRO1; }();
// CHECK-MESSAGES-NO-CONFIG: :[[@LINE-1]]:8: warning: inside a lambda,
'__func__' expands to the name of the function call operator; consider
capturing the name of the enclosing function explicitly
[bugprone-lambda-function-name]
- [func=__func__] { func; }();
}
#define FUNC_MACRO_WITH_FILE_AND_LINE Foo(__func__, __FILE__, __LINE__)
@@ -41,4 +40,14 @@ void Negatives() {
[] { FUNC_MACRO_WITH_FILE_AND_LINE; }();
[] { FUNCTION_MACRO_WITH_FILE_AND_LINE; }();
[] { EMBED_IN_ANOTHER_MACRO2; }();
+
+ [] (const char* func = __func__) { func; }();
+ [func=__func__] { func; }();
+ [] {
+ struct S {
+ void f() {
+ __func__;
+ }
+ };
+ }();
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
