Skip to content

Commit bd26b60

Browse files
zeyi2zeyi2
committed
move avoid-setjmp-longjmp from bugprone to modernize 
1 parent 414975e commit bd26b60

File tree

12 files changed

+28
-25
lines changed

12 files changed

+28
-25
lines changed

‎clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "ArgumentCommentCheck.h"
1313
#include "AssertSideEffectCheck.h"
1414
#include "AssignmentInIfConditionCheck.h"
15-
#include "AvoidSetjmpLongjmpCheck.h"
1615
#include "BadSignalToKillThreadCheck.h"
1716
#include "BitwisePointerCastCheck.h"
1817
#include "BoolPointerImplicitConversionCheck.h"
@@ -118,8 +117,6 @@ class BugproneModule : public ClangTidyModule {
118117
"bugprone-assert-side-effect");
119118
CheckFactories.registerCheck<AssignmentInIfConditionCheck>(
120119
"bugprone-assignment-in-if-condition");
121-
CheckFactories.registerCheck<AvoidSetjmpLongjmpCheck>(
122-
"bugprone-avoid-setjmp-longjmp");
123120
CheckFactories.registerCheck<BadSignalToKillThreadCheck>(
124121
"bugprone-bad-signal-to-kill-thread");
125122
CheckFactories.registerCheck<BitwisePointerCastCheck>(

‎clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ add_clang_library(clangTidyBugproneModule STATIC
77
ArgumentCommentCheck.cpp
88
AssertSideEffectCheck.cpp
99
AssignmentInIfConditionCheck.cpp
10-
AvoidSetjmpLongjmpCheck.cpp
1110
BadSignalToKillThreadCheck.cpp
1211
BitwisePointerCastCheck.cpp
1312
BoolPointerImplicitConversionCheck.cpp

‎clang-tools-extra/clang-tidy/cert/CERTTidyModule.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "../ClangTidy.h"
1010
#include "../ClangTidyModule.h"
1111
#include "../ClangTidyModuleRegistry.h"
12-
#include "../bugprone/AvoidSetjmpLongjmpCheck.h"
1312
#include "../bugprone/BadSignalToKillThreadCheck.h"
1413
#include "../bugprone/PointerArithmeticOnPolymorphicObjectCheck.h"
1514
#include "../bugprone/ReservedIdentifierCheck.h"
@@ -29,6 +28,7 @@
2928
#include "../misc/NonCopyableObjects.h"
3029
#include "../misc/StaticAssertCheck.h"
3130
#include "../misc/ThrowByValueCatchByReferenceCheck.h"
31+
#include "../modernize/AvoidSetjmpLongjmpCheck.h"
3232
#include "../modernize/AvoidVariadicFunctionsCheck.h"
3333
#include "../performance/MoveConstructorInitCheck.h"
3434
#include "../readability/EnumInitialValueCheck.h"
@@ -257,11 +257,10 @@ class CERTModule : public ClangTidyModule {
257257
// ERR
258258
CheckFactories.registerCheck<misc::ThrowByValueCatchByReferenceCheck>(
259259
"cert-err09-cpp");
260-
CheckFactories.registerCheck<bugprone::AvoidSetjmpLongjmpCheck>(
260+
CheckFactories.registerCheck<modernize::AvoidSetjmpLongjmpCheck>(
261261
"cert-err52-cpp");
262262
CheckFactories.registerCheck<bugprone::ThrowingStaticInitializationCheck>(
263263
"cert-err58-cpp");
264-
CheckFactories.registerCheck<StaticObjectExceptionCheck>("cert-err58-cpp");
265264
CheckFactories.registerCheck<ThrownExceptionTypeCheck>("cert-err60-cpp");
266265
CheckFactories.registerCheck<misc::ThrowByValueCatchByReferenceCheck>(
267266
"cert-err61-cpp");

‎clang-tools-extra/clang-tidy/bugprone/AvoidSetjmpLongjmpCheck.cpp‎ renamed to ‎clang-tools-extra/clang-tidy/modernize/AvoidSetjmpLongjmpCheck.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
using namespace clang::ast_matchers;
1717

18-
namespace clang::tidy::bugprone {
18+
namespace clang::tidy::modernize {
1919

2020
namespace {
2121
const char DiagWording[] =
@@ -62,4 +62,4 @@ void AvoidSetjmpLongjmpCheck::check(const MatchFinder::MatchResult &Result) {
6262
diag(E->getExprLoc(), DiagWording) << cast<NamedDecl>(E->getCalleeDecl());
6363
}
6464

65-
} // namespace clang::tidy::bugprone
65+
} // namespace clang::tidy::modernize

‎clang-tools-extra/clang-tidy/bugprone/AvoidSetjmpLongjmpCheck.h‎ renamed to ‎clang-tools-extra/clang-tidy/modernize/AvoidSetjmpLongjmpCheck.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BUGPRONE_AVOIDSETJMPLONGJMPCHECK_H
10-
#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BUGPRONE_AVOIDSETJMPLONGJMPCHECK_H
9+
#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_AVOIDSETJMPLONGJMPCHECK_H
10+
#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_AVOIDSETJMPLONGJMPCHECK_H
1111

1212
#include "../ClangTidyCheck.h"
1313

14-
namespace clang::tidy::bugprone {
14+
namespace clang::tidy::modernize {
1515

1616
/// Guards against use of setjmp/longjmp in C++ code
1717
///
1818
/// For the user-facing documentation see:
19-
/// http://clang.llvm.org/extra/clang-tidy/checks/bugprone/avoid-setjmp-longjmp.html
19+
/// http://clang.llvm.org/extra/clang-tidy/checks/modernize/avoid-setjmp-longjmp.html
2020
class AvoidSetjmpLongjmpCheck : public ClangTidyCheck {
2121
public:
2222
AvoidSetjmpLongjmpCheck(StringRef Name, ClangTidyContext *Context)
@@ -30,6 +30,6 @@ class AvoidSetjmpLongjmpCheck : public ClangTidyCheck {
3030
Preprocessor *ModuleExpanderPP) override;
3131
};
3232

33-
} // namespace clang::tidy::bugprone
33+
} // namespace clang::tidy::modernize
3434

35-
#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BUGPRONE_AVOIDSETJMPLONGJMPCHECK_H
35+
#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_AVOIDSETJMPLONGJMPCHECK_H

‎clang-tools-extra/clang-tidy/modernize/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ set(LLVM_LINK_COMPONENTS
66
add_clang_library(clangTidyModernizeModule STATIC
77
AvoidBindCheck.cpp
88
AvoidCArraysCheck.cpp
9+
AvoidSetjmpLongjmpCheck.cpp
910
AvoidVariadicFunctionsCheck.cpp
1011
ConcatNestedNamespacesCheck.cpp
1112
DeprecatedHeadersCheck.cpp

‎clang-tools-extra/clang-tidy/modernize/ModernizeTidyModule.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "../ClangTidyModuleRegistry.h"
1212
#include "AvoidBindCheck.h"
1313
#include "AvoidCArraysCheck.h"
14+
#include "AvoidSetjmpLongjmpCheck.h"
1415
#include "AvoidVariadicFunctionsCheck.h"
1516
#include "ConcatNestedNamespacesCheck.h"
1617
#include "DeprecatedHeadersCheck.h"
@@ -64,6 +65,8 @@ class ModernizeModule : public ClangTidyModule {
6465
void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
6566
CheckFactories.registerCheck<AvoidBindCheck>("modernize-avoid-bind");
6667
CheckFactories.registerCheck<AvoidCArraysCheck>("modernize-avoid-c-arrays");
68+
CheckFactories.registerCheck<AvoidSetjmpLongjmpCheck>(
69+
"modernize-avoid-setjmp-longjmp");
6770
CheckFactories.registerCheck<AvoidVariadicFunctionsCheck>(
6871
"modernize-avoid-variadic-functions");
6972
CheckFactories.registerCheck<ConcatNestedNamespacesCheck>(

‎clang-tools-extra/docs/ReleaseNotes.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ New check aliases
217217
keeping initial check as an alias to the new one.
218218

219219
- Renamed :doc:`cert-err52-cpp <clang-tidy/checks/cert/err52-cpp>` to
220-
:doc:`bugprone-avoid-setjmp-longjmp
221-
<clang-tidy/checks/bugprone/avoid-setjmp-longjmp>`
220+
:doc:`modernize-avoid-setjmp-longjmp
221+
<clang-tidy/checks/modernize/avoid-setjmp-longjmp>`
222222
keeping initial check as an alias to the new one.
223223

224224
- Renamed :doc:`cert-err58-cpp <clang-tidy/checks/cert/err58-cpp>` to

‎clang-tools-extra/docs/clang-tidy/checks/cert/err52-cpp.rst‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,9 @@ cert-err52-cpp
44
==============
55

66
The cert-err52-cpp check is an alias, please see
7-
`bugprone-avoid-setjmp-longjmp <../bugprone/avoid-setjmp-longjmp.html>`_
7+
`modernize-avoid-setjmp-longjmp <../modernize/avoid-setjmp-longjmp.html>`_
88
for more information.
9+
10+
This check corresponds to the CERT C++ Coding Standard rule
11+
`ERR52-CPP. Do not use setjmp() or longjmp()
12+
<https://www.securecoding.cert.org/confluence/pages/viewpage.action?pageId=1834>`_.

‎clang-tools-extra/docs/clang-tidy/checks/list.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ Clang-Tidy Checks
8080
:doc:`bugprone-argument-comment <bugprone/argument-comment>`, "Yes"
8181
:doc:`bugprone-assert-side-effect <bugprone/assert-side-effect>`,
8282
:doc:`bugprone-assignment-in-if-condition <bugprone/assignment-in-if-condition>`,
83-
:doc:`bugprone-avoid-setjmp-longjmp <bugprone/avoid-setjmp-longjmp>`,
8483
:doc:`bugprone-bad-signal-to-kill-thread <bugprone/bad-signal-to-kill-thread>`,
8584
:doc:`bugprone-bitwise-pointer-cast <bugprone/bitwise-pointer-cast>`,
8685
:doc:`bugprone-bool-pointer-implicit-conversion <bugprone/bool-pointer-implicit-conversion>`, "Yes"
@@ -287,6 +286,7 @@ Clang-Tidy Checks
287286
:doc:`misc-use-internal-linkage <misc/use-internal-linkage>`, "Yes"
288287
:doc:`modernize-avoid-bind <modernize/avoid-bind>`, "Yes"
289288
:doc:`modernize-avoid-c-arrays <modernize/avoid-c-arrays>`,
289+
:doc:`modernize-avoid-setjmp-longjmp <modernize/avoid-setjmp-longjmp>`,
290290
:doc:`modernize-avoid-variadic-functions <modernize/avoid-variadic-functions>`,
291291
:doc:`modernize-concat-nested-namespaces <modernize/concat-nested-namespaces>`, "Yes"
292292
:doc:`modernize-deprecated-headers <modernize/deprecated-headers>`, "Yes"
@@ -441,7 +441,7 @@ Check aliases
441441
:doc:`cert-dcl59-cpp <cert/dcl59-cpp>`, :doc:`google-build-namespaces <google/build-namespaces>`,
442442
:doc:`cert-err09-cpp <cert/err09-cpp>`, :doc:`misc-throw-by-value-catch-by-reference <misc/throw-by-value-catch-by-reference>`,
443443
:doc:`cert-err34-c <cert/err34-c>`, :doc:`bugprone-unchecked-string-to-number-conversion <bugprone/unchecked-string-to-number-conversion>`,
444-
:doc:`cert-err52-cpp <cert/err52-cpp>`, :doc:`bugprone-avoid-setjmp-longjmp <bugprone/avoid-setjmp-longjmp>`,
444+
:doc:`cert-err52-cpp <cert/err52-cpp>`, :doc:`modernize-avoid-setjmp-longjmp <modernize/avoid-setjmp-longjmp>`,
445445
:doc:`cert-err58-cpp <cert/err58-cpp>`, :doc:`bugprone-throwing-static-initialization <bugprone/throwing-static-initialization>`,
446446
:doc:`cert-err61-cpp <cert/err61-cpp>`, :doc:`misc-throw-by-value-catch-by-reference <misc/throw-by-value-catch-by-reference>`,
447447
:doc:`cert-exp42-c <cert/exp42-c>`, :doc:`bugprone-suspicious-memory-comparison <bugprone/suspicious-memory-comparison>`,

0 commit comments

Comments
 (0)