diff options
3 files changed, 23 insertions, 2 deletions
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp index 4a7aa50ac99..4d9be8151a0 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp @@ -404,8 +404,9 @@ void ProTypeMemberInitCheck::checkMissingMemberInitializer( return; // Don't suggest fixes for enums because we don't know a good default. // Don't suggest fixes for bitfields because in-class initialization is not - // possible. - if (F->getType()->isEnumeralType() || F->isBitField()) + // possible until C++2a. + if (F->getType()->isEnumeralType() || + (!getLangOpts().CPlusPlus2a && F->isBitField())) return; if (!F->getParent()->isUnion() || UnionsSeen.insert(F->getParent()).second) FieldsToFix.insert(F); diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx2a.cpp b/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx2a.cpp new file mode 100644 index 00000000000..d3e3ade3861 --- /dev/null +++ b/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init-cxx2a.cpp @@ -0,0 +1,19 @@ +// RUN: %check_clang_tidy %s cppcoreguidelines-pro-type-member-init %t -- -- -std=c++2a -fno-delayed-template-parsing + +struct PositiveBitfieldMember { + PositiveBitfieldMember() {} + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: constructor does not initialize these fields: F + unsigned F : 5; + // CHECK-FIXES: unsigned F : 5{}; +}; + +struct NegativeUnnamedBitfieldMember { + NegativeUnnamedBitfieldMember() {} + unsigned : 5; +}; + +struct NegativeInitializedBitfieldMembers { + NegativeInitializedBitfieldMembers() : F(3) { G = 2; } + unsigned F : 5; + unsigned G : 5; +}; diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp b/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp index bd2fdc12055..86f094de8de 100644 --- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp +++ b/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp @@ -474,6 +474,7 @@ struct PositiveBitfieldMember { PositiveBitfieldMember() {} // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: constructor does not initialize these fields: F unsigned F : 5; + // CHECK-FIXES-NOT: unsigned F : 5{}; }; struct NegativeUnnamedBitfieldMember { |
