https://github.com/HerrCai0907 updated
https://github.com/llvm/llvm-project/pull/94923
>From e467b03cc120eedc580c185232f000e0d8aa0cc7 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0...@163.com>
Date: Mon, 10 Jun 2024 09:04:27 +0800
Subject: [PATCH 1/2] [clang-tidy] fix false positives for the functions with
the same name as standard library functions in misc-include-cleaner
Fixes: #93335
---
clang-tools-extra/docs/ReleaseNotes.rst | 4 ++++
.../include-cleaner/lib/LocateSymbol.cpp | 8 ++++++--
.../include-cleaner/unittests/FindHeadersTest.cpp | 11 +++++++++++
.../test/clang-tidy/checkers/misc/include-cleaner.cpp | 2 ++
4 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst
b/clang-tools-extra/docs/ReleaseNotes.rst
index 3f0d25ec8c752..8c78d872b9a1a 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -286,6 +286,10 @@ Changes in existing checks
Additionally, the option `UseHeaderFileExtensions` is removed, so that the
check uses the `HeaderFileExtensions` option unconditionally.
+- Improved :doc:`misc-include-cleaner
+ <clang-tidy/checks/misc/include-cleaner>` check by avoiding false positives
for
+ the functions with the same name as standard library functions.
+
- Improved :doc:`misc-unused-using-decls
<clang-tidy/checks/misc/unused-using-decls>` check by replacing the local
option `HeaderFileExtensions` by the global option of the same name.
diff --git a/clang-tools-extra/include-cleaner/lib/LocateSymbol.cpp
b/clang-tools-extra/include-cleaner/lib/LocateSymbol.cpp
index 78e783a62eb27..9148d36a5038f 100644
--- a/clang-tools-extra/include-cleaner/lib/LocateSymbol.cpp
+++ b/clang-tools-extra/include-cleaner/lib/LocateSymbol.cpp
@@ -14,6 +14,7 @@
#include "clang/AST/DeclTemplate.h"
#include "clang/Tooling/Inclusions/StandardLibrary.h"
#include "llvm/Support/Casting.h"
+#include "llvm/Support/raw_ostream.h"
#include <utility>
#include <vector>
@@ -40,8 +41,11 @@ Hints declHints(const Decl *D) {
std::vector<Hinted<SymbolLocation>> locateDecl(const Decl &D) {
std::vector<Hinted<SymbolLocation>> Result;
// FIXME: Should we also provide physical locations?
- if (auto SS = tooling::stdlib::Recognizer()(&D))
- return {{*SS, Hints::CompleteSymbol}};
+ if (auto SS = tooling::stdlib::Recognizer()(&D)) {
+ Result.push_back({*SS, Hints::CompleteSymbol});
+ if (!D.hasBody())
+ return Result;
+ }
// FIXME: Signal foreign decls, e.g. a forward declaration not owned by a
// library. Some useful signals could be derived by checking the DeclContext.
// Most incidental forward decls look like:
diff --git a/clang-tools-extra/include-cleaner/unittests/FindHeadersTest.cpp
b/clang-tools-extra/include-cleaner/unittests/FindHeadersTest.cpp
index 07302142a13e3..fdcbf25fd628c 100644
--- a/clang-tools-extra/include-cleaner/unittests/FindHeadersTest.cpp
+++ b/clang-tools-extra/include-cleaner/unittests/FindHeadersTest.cpp
@@ -628,6 +628,17 @@ TEST_F(HeadersForSymbolTest, StandardHeaders) {
tooling::stdlib::Header::named("<assert.h>")));
}
+TEST_F(HeadersForSymbolTest, NonStandardHeaders) {
+ Inputs.Code = "void assert() {}";
+ buildAST();
+ EXPECT_THAT(
+ headersFor("assert"),
+ // Respect the ordering from the stdlib mapping.
+ UnorderedElementsAre(physicalHeader("input.mm"),
+ tooling::stdlib::Header::named("<cassert>"),
+ tooling::stdlib::Header::named("<assert.h>")));
+}
+
TEST_F(HeadersForSymbolTest, ExporterNoNameMatch) {
Inputs.Code = R"cpp(
#include "exporter/foo.h"
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
b/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
index e10ac3f46e2e9..b1e001834db5a 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
@@ -15,3 +15,5 @@ std::string HelloString;
// CHECK-MESSAGES: :[[@LINE-1]]:6: warning: no header providing "std::string"
is directly included [misc-include-cleaner]
int FooBarResult = foobar();
// CHECK-MESSAGES: :[[@LINE-1]]:20: warning: no header providing "foobar" is
directly included [misc-include-cleaner]
+
+void log2() {}
>From 0e3d60906d390990f029baa226b76bc55927f27a Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0...@163.com>
Date: Tue, 11 Jun 2024 11:24:40 +0800
Subject: [PATCH 2/2] Update
clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
---
.../test/clang-tidy/checkers/misc/include-cleaner.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
b/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
index b1e001834db5a..d5ea96b00254c 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
@@ -16,4 +16,10 @@ std::string HelloString;
int FooBarResult = foobar();
// CHECK-MESSAGES: :[[@LINE-1]]:20: warning: no header providing "foobar" is
directly included [misc-include-cleaner]
+namespace valid {
+
+namespace gh93335 {
void log2() {}
+} // namespace gh93335
+
+} // namespace valid
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
