diff --git a/clang-tools-extra/clang-tidy/bugprone/ThrowKeywordMissingCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ThrowKeywordMissingCheck.cpp index 64c155c29cf8b..17d2e75e4f666 100644 --- a/clang-tools-extra/clang-tidy/bugprone/ThrowKeywordMissingCheck.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/ThrowKeywordMissingCheck.cpp @@ -15,9 +15,6 @@ using namespace clang::ast_matchers; namespace clang::tidy::bugprone { void ThrowKeywordMissingCheck::registerMatchers(MatchFinder *Finder) { - auto CtorInitializerList = - cxxConstructorDecl(hasAnyConstructorInitializer(anything())); - Finder->addMatcher( cxxConstructExpr( hasType(cxxRecordDecl( @@ -27,7 +24,7 @@ void ThrowKeywordMissingCheck::registerMatchers(MatchFinder *Finder) { stmt(anyOf(cxxThrowExpr(), callExpr(), returnStmt()))), hasAncestor(decl(anyOf(varDecl(), fieldDecl()))), hasAncestor(expr(cxxNewExpr(hasAnyPlacementArg(anything())))), - allOf(hasAncestor(CtorInitializerList), + allOf(hasAncestor(cxxConstructorDecl()), unless(hasAncestor(cxxCatchStmt())))))) .bind("temporary-exception-not-thrown"), this); diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index 51ba157ab05de..e3294c1289635 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -177,6 +177,10 @@ Changes in existing checks usages of ``sizeof()``, ``alignof()``, and ``offsetof()`` when adding or subtracting from a pointer directly or when used to scale a numeric value. +- Improved :doc:`bugprone-throw-keyword-missing + ` by fixing a false positive + when using non-static member initializers and a constructor. + - Improved :doc:`bugprone-unchecked-optional-access ` to support `bsl::optional` and `bdlb::NullableValue` from diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/throw-keyword-missing.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/throw-keyword-missing.cpp index 49233c0deefdf..bafd3d19b5a31 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/throw-keyword-missing.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/throw-keyword-missing.cpp @@ -139,6 +139,15 @@ CtorInitializerListTest::CtorInitializerListTest(float) try : exc(RegularExcepti RegularException(); } +namespace GH115055 { +class CtorInitializerListTest2 { + public: + CtorInitializerListTest2() {} + private: + RegularException exc{}; +}; +} // namespace GH115055 + RegularException funcReturningExceptionTest(int i) { return RegularException(); }