Author: Zeyi Xu Date: 2026-06-03T17:51:30+08:00 New Revision: 75dece729ccdbae01e1d09d4adf9604ea1103905
URL: https://github.com/llvm/llvm-project/commit/75dece729ccdbae01e1d09d4adf9604ea1103905 DIFF: https://github.com/llvm/llvm-project/commit/75dece729ccdbae01e1d09d4adf9604ea1103905.diff LOG: [clang-tidy] Avoid evaluating value-dependent static initializers in fuchsia-statically-constructed-objects (#201287) Static data member initializers in class templates could crash the check when they used non-type template parameters. This commit skips them during analysis. Closes https://github.com/llvm/llvm-project/issues/201110 Added: Modified: clang-tools-extra/clang-tidy/fuchsia/StaticallyConstructedObjectsCheck.cpp clang-tools-extra/docs/ReleaseNotes.rst clang-tools-extra/test/clang-tidy/checkers/fuchsia/statically-constructed-objects.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/fuchsia/StaticallyConstructedObjectsCheck.cpp b/clang-tools-extra/clang-tidy/fuchsia/StaticallyConstructedObjectsCheck.cpp index 9e540e03d365b..8be6441ee58d3 100644 --- a/clang-tools-extra/clang-tidy/fuchsia/StaticallyConstructedObjectsCheck.cpp +++ b/clang-tools-extra/clang-tidy/fuchsia/StaticallyConstructedObjectsCheck.cpp @@ -35,8 +35,8 @@ void StaticallyConstructedObjectsCheck::registerMatchers(MatchFinder *Finder) { hasDescendant(cxxConstructExpr(unless(allOf( // ... unless it is constexpr ... hasDeclaration(cxxConstructorDecl(isConstexpr())), - // ... and is statically initialized. - isConstantInitializer()))))) + // ... and is statically initialized or value-dependent. + anyOf(isValueDependent(), isConstantInitializer())))))) .bind("decl")), this); } diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index e6897ebb4cf9f..fa53072be1eac 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -511,6 +511,10 @@ Changes in existing checks `IgnoreMacros` option. When enabled, unscoped ``enum`` declarations within macros are ignored. +- Improved :doc:`fuchsia-statically-constructed-objects + <clang-tidy/checks/fuchsia/statically-constructed-objects>` check by fixing a + crash when checking value-dependent static member initializers in class templates. + - Improved :doc:`llvm-use-ranges <clang-tidy/checks/llvm/use-ranges>` check by adding support for the following algorithms: ``std::accumulate``, ``std::replace_copy``, and diff --git a/clang-tools-extra/test/clang-tidy/checkers/fuchsia/statically-constructed-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia/statically-constructed-objects.cpp index 006494eeca679..37ca2c0dee4f2 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/fuchsia/statically-constructed-objects.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/fuchsia/statically-constructed-objects.cpp @@ -81,6 +81,14 @@ static S s3(get_i()); // CHECK-MESSAGES: [[@LINE-1]]:1: warning: static objects are disallowed; if possible, use a constexpr constructor instead [fuchsia-statically-constructed-objects] // CHECK-MESSAGES-NEXT: static S s3(get_i()); +template <typename T, int Val> +struct ClassTemplateWithStaticMember { + static S StaticMember; +}; + +template <typename T, int Val> +S ClassTemplateWithStaticMember<T, Val>::StaticMember(Val); + void f() { // Locally static is fine static int i; _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
