https://github.com/localspook updated
https://github.com/llvm/llvm-project/pull/147406
>From 6f1c9ae3079e4958f29c71a9e09b74b33758effe Mon Sep 17 00:00:00 2001
From: Victor Chernyakin <chernyakin.victo...@outlook.com>
Date: Mon, 7 Jul 2025 14:14:44 -0700
Subject: [PATCH 1/2] [clang-tidy][NFC] Do more work at compile time
---
clang-tools-extra/clang-tidy/ClangTidy.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp
b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 808515c463b91..1c07c3ad549c5 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -669,18 +669,19 @@ getAllChecksAndOptions(bool
AllowEnablingAnalyzerAlphaCheckers) {
Buffer.append(AnalyzerCheck);
Result.Checks.insert(Buffer);
}
- for (std::string OptionName : {
+
+ static constexpr llvm::StringLiteral OptionNames[] = {
#define GET_CHECKER_OPTIONS
#define CHECKER_OPTION(TYPE, CHECKER, OPTION_NAME, DESCRIPTION, DEFAULT,
\
RELEASE, HIDDEN)
\
- Twine(AnalyzerCheckNamePrefix).concat(CHECKER ":" OPTION_NAME).str(),
+ "clang-analyzer-" CHECKER ":" OPTION_NAME,
#include "clang/StaticAnalyzer/Checkers/Checkers.inc"
#undef CHECKER_OPTION
#undef GET_CHECKER_OPTIONS
- }) {
- Result.Options.insert(OptionName);
- }
+ };
+
+ Result.Options.insert_range(OptionNames);
#endif // CLANG_TIDY_ENABLE_STATIC_ANALYZER
Context.setOptionsCollector(&Result.Options);
>From cfa47b311ad71799aeecd20c94e3c3ef02aa9aab Mon Sep 17 00:00:00 2001
From: Victor Chernyakin <chernyakin.victo...@outlook.com>
Date: Wed, 9 Jul 2025 02:39:12 -0700
Subject: [PATCH 2/2] Macroize and rebase to resolve merge conflict
---
clang-tools-extra/clang-tidy/ClangTidy.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp
b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 1c07c3ad549c5..ad59b90cebb95 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -55,8 +55,9 @@ namespace clang::tidy {
namespace {
#if CLANG_TIDY_ENABLE_STATIC_ANALYZER
+#define ANALYZER_CHECK_NAME_PREFIX "clang-analyzer-"
static constexpr llvm::StringLiteral AnalyzerCheckNamePrefix =
- "clang-analyzer-";
+ ANALYZER_CHECK_NAME_PREFIX;
class AnalyzerDiagnosticConsumer : public ento::PathDiagnosticConsumer {
public:
@@ -674,7 +675,7 @@ getAllChecksAndOptions(bool
AllowEnablingAnalyzerAlphaCheckers) {
#define GET_CHECKER_OPTIONS
#define CHECKER_OPTION(TYPE, CHECKER, OPTION_NAME, DESCRIPTION, DEFAULT,
\
RELEASE, HIDDEN)
\
- "clang-analyzer-" CHECKER ":" OPTION_NAME,
+ ANALYZER_CHECK_NAME_PREFIX CHECKER ":" OPTION_NAME,
#include "clang/StaticAnalyzer/Checkers/Checkers.inc"
#undef CHECKER_OPTION
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
