https://github.com/HerrCai0907 updated
https://github.com/llvm/llvm-project/pull/120004
>From b3b848df1a985754580ebbaa5f8136cb2c6bf3d6 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0...@163.com>
Date: Sun, 15 Dec 2024 12:19:55 +0800
Subject: [PATCH 1/2] [clang-tidy][NFC] use local config in test cases
follow up patch for #119948.
---
.../clang-tidy/misc/IncludeCleanerCheck.cpp | 7 +++----
.../InconsistentDeclarationParameterNameCheck.h | 2 +-
clang-tools-extra/docs/ReleaseNotes.rst | 4 ++++
.../checkers/bugprone/argument-comment-strict.cpp | 2 +-
.../cppcoreguidelines/pro-type-const-cast.cpp | 2 +-
.../pro-type-static-cast-downcast.cpp | 2 +-
.../checkers/misc/unused-parameters-strict.cpp | 2 +-
.../checkers/modernize/use-std-format.cpp | 4 ++--
.../checkers/modernize/use-std-print-absl.cpp | 4 ++--
.../checkers/modernize/use-std-print.cpp | 4 ++--
.../unittests/clang-tidy/IncludeCleanerTest.cpp | 14 ++++++++------
11 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp
b/clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp
index 5e7a0e65690b7a..7638bbc103d16d 100644
--- a/clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp
@@ -57,10 +57,9 @@ struct MissingIncludeInfo {
IncludeCleanerCheck::IncludeCleanerCheck(StringRef Name,
ClangTidyContext *Context)
: ClangTidyCheck(Name, Context),
- IgnoreHeaders(utils::options::parseStringList(
- Options.getLocalOrGlobal("IgnoreHeaders", ""))),
- DeduplicateFindings(
- Options.getLocalOrGlobal("DeduplicateFindings", true)) {
+ IgnoreHeaders(
+ utils::options::parseStringList(Options.get("IgnoreHeaders", ""))),
+ DeduplicateFindings(Options.get("DeduplicateFindings", true)) {
for (const auto &Header : IgnoreHeaders) {
if (!llvm::Regex{Header}.isValid())
configurationDiag("Invalid ignore headers regex '%0'") << Header;
diff --git
a/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
b/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
index 1c526577b403f6..0c5ead860c161a 100644
---
a/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
+++
b/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
@@ -26,7 +26,7 @@ class InconsistentDeclarationParameterNameCheck : public
ClangTidyCheck {
ClangTidyContext *Context)
: ClangTidyCheck(Name, Context),
IgnoreMacros(Options.getLocalOrGlobal("IgnoreMacros", true)),
- Strict(Options.getLocalOrGlobal("Strict", false)) {}
+ Strict(Options.get("Strict", false)) {}
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst
b/clang-tools-extra/docs/ReleaseNotes.rst
index 6803842106791b..9e588913675039 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -115,6 +115,10 @@ Improvements to clang-tidy
- Improved :program:`run-clang-tidy.py` script. Fixed minor shutdown noise
happening on certain platforms when interrupting the script.
+- Removed :program:`clang-tidy`'s global options for most of checks. All
options
+ are changed to local options except `IncludeStyle`, `StrictMode` and
+ `IgnoreMacros`.
+
New checks
^^^^^^^^^^
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp
index c25d25ac5738fb..38d91f39846478 100644
---
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp
+++
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \
-// RUN: -config="{CheckOptions: {StrictMode: true}}" --
+// RUN: -config="{CheckOptions: {bugprone-argument-comment.StrictMode:
true}}" --
void f(int _with_underscores_);
void g(int x_);
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-const-cast.cpp
b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-const-cast.cpp
index be70e3ba356991..a775334260e35c 100644
---
a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-const-cast.cpp
+++
b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-const-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -check-suffix=STRICT %s
cppcoreguidelines-pro-type-const-cast %t -- -config="{CheckOptions:
{StrictMode: true}}"
+// RUN: %check_clang_tidy -check-suffix=STRICT %s
cppcoreguidelines-pro-type-const-cast %t -- -config="{CheckOptions:
{cppcoreguidelines-pro-type-const-cast.StrictMode: true}}"
// RUN: %check_clang_tidy -check-suffix=NSTRICT %s
cppcoreguidelines-pro-type-const-cast %t
namespace Const {
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-static-cast-downcast.cpp
b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-static-cast-downcast.cpp
index 11179b7d2d19b8..a3c73a960974ba 100644
---
a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-static-cast-downcast.cpp
+++
b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-static-cast-downcast.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy -check-suffixes=NSTRICT,STRICT %s
cppcoreguidelines-pro-type-static-cast-downcast %t
-// RUN: %check_clang_tidy -check-suffix=NSTRICT %s
cppcoreguidelines-pro-type-static-cast-downcast %t -- -config="{CheckOptions:
{StrictMode: false}}"
+// RUN: %check_clang_tidy -check-suffix=NSTRICT %s
cppcoreguidelines-pro-type-static-cast-downcast %t -- -config="{CheckOptions:
{cppcoreguidelines-pro-type-static-cast-downcast.StrictMode: false}}"
class Base {
};
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp
b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp
index f8385c1a17e7bb..319cefa1c68f10 100644
---
a/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp
+++
b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy %s misc-unused-parameters %t -- \
-// RUN: -config="{CheckOptions: {StrictMode: true}}" --
+// RUN: -config="{CheckOptions: {misc-unused-parameters.StrictMode: true}}"
--
// Warn on empty function bodies in StrictMode.
namespace strict_mode {
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-format.cpp
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-format.cpp
index 42fb3382e4a936..0a5a63eba2596a 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-format.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-format.cpp
@@ -1,12 +1,12 @@
// RUN: %check_clang_tidy \
// RUN: -std=c++20 %s modernize-use-std-format %t -- \
-// RUN: -config="{CheckOptions: {StrictMode: true}}" \
+// RUN: -config="{CheckOptions: {modernize-use-std-format.StrictMode:
true}}" \
// RUN: -- -isystem %clang_tidy_headers \
// RUN: -DPRI_CMDLINE_MACRO="\"s\"" \
// RUN: -D__PRI_CMDLINE_MACRO="\"s\""
// RUN: %check_clang_tidy \
// RUN: -std=c++20 %s modernize-use-std-format %t -- \
-// RUN: -config="{CheckOptions: {StrictMode: false}}" \
+// RUN: -config="{CheckOptions: {modernize-use-std-format.StrictMode:
false}}" \
// RUN: -- -isystem %clang_tidy_headers \
// RUN: -DPRI_CMDLINE_MACRO="\"s\"" \
// RUN: -D__PRI_CMDLINE_MACRO="\"s\""
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-absl.cpp
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-absl.cpp
index 95c32837e4447b..83fbd2e7500c5b 100644
---
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-absl.cpp
+++
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-absl.cpp
@@ -1,10 +1,10 @@
// RUN: %check_clang_tidy \
// RUN: -std=c++23 %s modernize-use-std-print %t -- \
-// RUN: -config="{CheckOptions: {StrictMode: true}}" \
+// RUN: -config="{CheckOptions: {modernize-use-std-print.StrictMode: true}}"
\
// RUN: -- -isystem %clang_tidy_headers
// RUN: %check_clang_tidy \
// RUN: -std=c++23 %s modernize-use-std-print %t -- \
-// RUN: -config="{CheckOptions: {StrictMode: false}}" \
+// RUN: -config="{CheckOptions: {modernize-use-std-print.StrictMode:
false}}" \
// RUN: -- -isystem %clang_tidy_headers
#include <cstdio>
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print.cpp
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print.cpp
index f11fc408fcb9c8..5da995d9d6e830 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print.cpp
@@ -1,12 +1,12 @@
// RUN: %check_clang_tidy -check-suffixes=,STRICT \
// RUN: -std=c++23 %s modernize-use-std-print %t -- \
-// RUN: -config="{CheckOptions: {StrictMode: true}}" \
+// RUN: -config="{CheckOptions: {modernize-use-std-print.StrictMode: true}}"
\
// RUN: -- -isystem %clang_tidy_headers -fexceptions \
// RUN: -DPRI_CMDLINE_MACRO="\"s\"" \
// RUN: -D__PRI_CMDLINE_MACRO="\"s\""
// RUN: %check_clang_tidy -check-suffixes=,NOTSTRICT \
// RUN: -std=c++23 %s modernize-use-std-print %t -- \
-// RUN: -config="{CheckOptions: {StrictMode: false}}" \
+// RUN: -config="{CheckOptions: {modernize-use-std-print.StrictMode:
false}}" \
// RUN: -- -isystem %clang_tidy_headers -fexceptions \
// RUN: -DPRI_CMDLINE_MACRO="\"s\"" \
// RUN: -D__PRI_CMDLINE_MACRO="\"s\""
diff --git a/clang-tools-extra/unittests/clang-tidy/IncludeCleanerTest.cpp
b/clang-tools-extra/unittests/clang-tidy/IncludeCleanerTest.cpp
index d400cf6fe2d576..3d6ec995e443d4 100644
--- a/clang-tools-extra/unittests/clang-tidy/IncludeCleanerTest.cpp
+++ b/clang-tools-extra/unittests/clang-tidy/IncludeCleanerTest.cpp
@@ -71,10 +71,12 @@ TEST(IncludeCleanerCheckTest, SuppressUnusedIncludes) {
std::vector<ClangTidyError> Errors;
ClangTidyOptions Opts;
- Opts.CheckOptions["IgnoreHeaders"] = llvm::StringRef{llvm::formatv(
- "bar.h;{0};{1};vector;<list>;",
- llvm::Regex::escape(appendPathFileSystemIndependent({"foo", "qux.h"})),
- llvm::Regex::escape(appendPathFileSystemIndependent({"baz", "qux"})))};
+ Opts.CheckOptions["test-check-0.IgnoreHeaders"] = llvm::StringRef{
+ llvm::formatv("bar.h;{0};{1};vector;<list>;",
+ llvm::Regex::escape(
+ appendPathFileSystemIndependent({"foo", "qux.h"})),
+ llvm::Regex::escape(
+ appendPathFileSystemIndependent({"baz", "qux"})))};
EXPECT_EQ(
PostCode,
runCheckOnCode<IncludeCleanerCheck>(
@@ -139,7 +141,7 @@ int BarResult2 = $diag2^bar();)");
{
std::vector<ClangTidyError> Errors;
ClangTidyOptions Opts;
- Opts.CheckOptions.insert({"DeduplicateFindings", "false"});
+ Opts.CheckOptions["test-check-0.DeduplicateFindings"] = "false";
runCheckOnCode<IncludeCleanerCheck>(Code.code(), &Errors, "file.cpp", {},
Opts,
{{"baz.h", R"(#pragma once
@@ -170,7 +172,7 @@ std::vector x;
)";
ClangTidyOptions Opts;
- Opts.CheckOptions["IgnoreHeaders"] = llvm::StringRef{
+ Opts.CheckOptions["test-check-0.IgnoreHeaders"] = llvm::StringRef{
"public.h;<vector>;baz.h;" +
llvm::Regex::escape(appendPathFileSystemIndependent({"foo", "qux.h"}))};
std::vector<ClangTidyError> Errors;
>From be5732f8b75ced186d8131c301af68e50f2c4a75 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0...@163.com>
Date: Mon, 16 Dec 2024 22:03:27 +0800
Subject: [PATCH 2/2] list all options removed from global option
---
clang-tools-extra/docs/ReleaseNotes.rst | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst
b/clang-tools-extra/docs/ReleaseNotes.rst
index 9e588913675039..3fd7a4f9da18ad 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -119,6 +119,20 @@ Improvements to clang-tidy
are changed to local options except `IncludeStyle`, `StrictMode` and
`IgnoreMacros`.
+.. csv-table::
+ :header: "Check", "Options removed from global option"
+
+ :doc:`bugprone-reserved-identifier
<clang-tidy/checks/bugprone/reserved-identifier>`,
AggressiveDependentMemberLookup
+ :doc:`bugprone-unchecked-optional-access
<clang-tidy/checks/bugprone/unchecked-optional-access>`,
IgnoreSmartPointerDereference
+ :doc:`cppcoreguidelines-pro-type-member-init
<clang-tidy/checks/cppcoreguidelines/pro-type-member-init>`, UseAssignment
+ :doc:`cppcoreguidelines-rvalue-reference-param-not-moved
<clang-tidy/checks/cppcoreguidelines/rvalue-reference-param-not-moved>`,
AllowPartialMove; IgnoreUnnamedParams; IgnoreNonDeducedTemplateTypes
+ :doc:`misc-include-cleaner <clang-tidy/checks/misc/include-cleaner>`,
IgnoreHeaders; DeduplicateFindings
+ :doc:`performance-inefficient-vector-operation
<clang-tidy/checks/performance/inefficient-vector-operation>`, EnableProto
+ :doc:`readability-identifier-naming
<clang-tidy/checks/readability/identifier-naming>`,
AggressiveDependentMemberLookup
+ :doc:`readability-inconsistent-declaration-parameter-name
<clang-tidy/checks/readability/inconsistent-declaration-parameter-name>`, Strict
+ :doc:`readability-redundant-access-specifiers
<clang-tidy/checks/readability/redundant-access-specifiers>`,
CheckFirstDeclaration
+ :doc:`readability-redundant-casting
<clang-tidy/checks/readability/redundant-casting>`, IgnoreTypeAliases
+
New checks
^^^^^^^^^^
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
