Author: Congcong Cai Date: 2024-02-16T09:18:21+08:00 New Revision: e9cec392398ca5c7ce56ba52f9abb90f42a16c24
URL: https://github.com/llvm/llvm-project/commit/e9cec392398ca5c7ce56ba52f9abb90f42a16c24 DIFF: https://github.com/llvm/llvm-project/commit/e9cec392398ca5c7ce56ba52f9abb90f42a16c24.diff LOG: [clang-tidy] fix incorrect hint for InitListExpr in prefer-member-initializer (#81560) Added: Modified: clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp clang-tools-extra/docs/ReleaseNotes.rst clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp index de96c3dc4efef7..5f046c502eb383 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp @@ -203,6 +203,7 @@ void PreferMemberInitializerCheck::check( SourceLocation InsertPos; SourceRange ReplaceRange; bool AddComma = false; + bool AddBrace = false; bool InvalidFix = false; unsigned Index = Field->getFieldIndex(); const CXXCtorInitializer *LastInListInit = nullptr; @@ -215,6 +216,7 @@ void PreferMemberInitializerCheck::check( InsertPos = Init->getRParenLoc(); else { ReplaceRange = Init->getInit()->getSourceRange(); + AddBrace = isa<InitListExpr>(Init->getInit()); } break; } @@ -279,6 +281,9 @@ void PreferMemberInitializerCheck::check( if (HasInitAlready) { if (InsertPos.isValid()) Diag << FixItHint::CreateInsertion(InsertPos, NewInit); + else if (AddBrace) + Diag << FixItHint::CreateReplacement(ReplaceRange, + ("{" + NewInit + "}").str()); else Diag << FixItHint::CreateReplacement(ReplaceRange, NewInit); } else { diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index a1b95d2a2020fe..6b0c85ea84e6c6 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -131,7 +131,8 @@ Changes in existing checks <https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#c48-prefer-in-class-initializers-to-member-initializers-in-constructors-for-constant-initializers>`_, which was deprecated since :program:`clang-tidy` 17. This rule is now covered by :doc:`cppcoreguidelines-use-default-member-init - <clang-tidy/checks/cppcoreguidelines/use-default-member-init>`. + <clang-tidy/checks/cppcoreguidelines/use-default-member-init>` and fixes + incorrect hints when using list-initialization. - Improved :doc:`google-build-namespaces <clang-tidy/checks/google/build-namespaces>` check by replacing the local diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer.cpp index 8086caa2aa6f2c..e784a350c48f5a 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer.cpp @@ -616,3 +616,26 @@ class Foo { #undef INVALID_HANDLE_VALUE #undef RGB } + +namespace GH77684 { +struct S1 { +// CHECK-MESSAGES: :[[@LINE+1]]:16: warning: 'M' should be initialized in a member initializer of the constructor [cppcoreguidelines-prefer-member-initializer] + S1() : M{} { M = 0; } +// CHECK-FIXES: S1() : M{0} { } + int M; +}; +struct S2 { +// CHECK-MESSAGES: :[[@LINE+1]]:17: warning: 'M' should be initialized in a member initializer of the constructor [cppcoreguidelines-prefer-member-initializer] + S2() : M{2} { M = 1; } +// CHECK-FIXES: S2() : M{1} { } + int M; +}; +struct T { int a; int b; int c; }; +T v; +struct S3 { +// CHECK-MESSAGES: :[[@LINE+1]]:21: warning: 'M' should be initialized in a member initializer of the constructor [cppcoreguidelines-prefer-member-initializer] + S3() : M{1,2,3} { M = v; } +// CHECK-FIXES: S3() : M{v} { } + T M; +}; +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits