https://github.com/HerrCai0907 updated
https://github.com/llvm/llvm-project/pull/116635
>From 74c7a62a93c435a25fa524b1d1ede1fc9fe40a07 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0...@163.com>
Date: Mon, 18 Nov 2024 23:06:19 +0800
Subject: [PATCH 1/2] [clang-tidy][NFC] fix typo in ExceptionAnalyzer; replace
count()>0 with contains
---
.../clang-tidy/bugprone/ExceptionEscapeCheck.cpp | 2 +-
clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp | 6 +++---
clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
index 620a57194acb8e..3d1f63fcf33a5a 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ExceptionEscapeCheck.cpp
@@ -20,7 +20,7 @@ namespace {
AST_MATCHER_P(FunctionDecl, isEnabled, llvm::StringSet<>,
FunctionsThatShouldNotThrow) {
- return FunctionsThatShouldNotThrow.count(Node.getNameAsString()) > 0;
+ return FunctionsThatShouldNotThrow.contains(Node.getNameAsString());
}
AST_MATCHER(FunctionDecl, isExplicitThrow) {
diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp
b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp
index 9bfb7e2677533a..431dcb521029f2 100644
--- a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp
+++ b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp
@@ -418,7 +418,7 @@ ExceptionAnalyzer::ExceptionInfo::filterIgnoredExceptions(
if (TD->getDeclName().isIdentifier()) {
if ((IgnoreBadAlloc &&
(TD->getName() == "bad_alloc" && TD->isInStdNamespace())) ||
- (IgnoredTypes.count(TD->getName()) > 0))
+ (IgnoredTypes.contains(TD->getName())))
TypesToDelete.push_back(T);
}
}
@@ -449,7 +449,7 @@ void
ExceptionAnalyzer::ExceptionInfo::reevaluateBehaviour() {
ExceptionAnalyzer::ExceptionInfo ExceptionAnalyzer::throwsException(
const FunctionDecl *Func, const ExceptionInfo::Throwables &Caught,
llvm::SmallSet<const FunctionDecl *, 32> &CallStack) {
- if (!Func || CallStack.count(Func) || (!CallStack.empty() &&
!canThrow(Func)))
+ if (!Func || CallStack.contains(Func) || (!CallStack.empty() &&
!canThrow(Func)))
return ExceptionInfo::createNonThrowing();
if (const Stmt *Body = Func->getBody()) {
@@ -507,7 +507,7 @@ ExceptionAnalyzer::ExceptionInfo
ExceptionAnalyzer::throwsException(
for (unsigned I = 0; I < Try->getNumHandlers(); ++I) {
const CXXCatchStmt *Catch = Try->getHandler(I);
- // Everything is catched through 'catch(...)'.
+ // Everything is caught through 'catch(...)'.
if (!Catch->getExceptionDecl()) {
ExceptionInfo Rethrown = throwsException(
Catch->getHandlerBlock(), Uncaught.getExceptionTypes(), CallStack);
diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
index 0a8cf8668d3ca9..d8471f4d4c6cbc 100644
--- a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
+++ b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
@@ -101,7 +101,7 @@ class ExceptionAnalyzer {
/// Recalculate the 'Behaviour' for example after filtering.
void reevaluateBehaviour();
- /// Keep track if the entity related to this 'ExceptionInfo' can in
princple
+ /// Keep track if the entity related to this 'ExceptionInfo' can in
principle
/// throw, if it's unknown or if it won't throw.
State Behaviour;
>From af817d9ba862dc6793df36e6bbe525c1d84a82e2 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0...@163.com>
Date: Mon, 18 Nov 2024 23:51:44 +0800
Subject: [PATCH 2/2] fix format
---
clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp | 3 ++-
clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp
b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp
index 431dcb521029f2..68f3ecf6bdaa81 100644
--- a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp
+++ b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp
@@ -449,7 +449,8 @@ void
ExceptionAnalyzer::ExceptionInfo::reevaluateBehaviour() {
ExceptionAnalyzer::ExceptionInfo ExceptionAnalyzer::throwsException(
const FunctionDecl *Func, const ExceptionInfo::Throwables &Caught,
llvm::SmallSet<const FunctionDecl *, 32> &CallStack) {
- if (!Func || CallStack.contains(Func) || (!CallStack.empty() &&
!canThrow(Func)))
+ if (!Func || CallStack.contains(Func) ||
+ (!CallStack.empty() && !canThrow(Func)))
return ExceptionInfo::createNonThrowing();
if (const Stmt *Body = Func->getBody()) {
diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
index d8471f4d4c6cbc..6c2d693d64b50e 100644
--- a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
+++ b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
@@ -101,8 +101,8 @@ class ExceptionAnalyzer {
/// Recalculate the 'Behaviour' for example after filtering.
void reevaluateBehaviour();
- /// Keep track if the entity related to this 'ExceptionInfo' can in
principle
- /// throw, if it's unknown or if it won't throw.
+ /// Keep track if the entity related to this 'ExceptionInfo' can in
+ /// principle throw, if it's unknown or if it won't throw.
State Behaviour;
/// Keep track if the entity contains any unknown elements to keep track
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
