malcolm.parsons updated this revision to Diff 131069. malcolm.parsons added a comment.
Use ternary operator. Repository: rCTE Clang Tools Extra https://reviews.llvm.org/D42413 Files: clang-tidy/modernize/UseDefaultMemberInitCheck.cpp test/clang-tidy/modernize-use-default-member-init-bitfield.cpp Index: test/clang-tidy/modernize-use-default-member-init-bitfield.cpp =================================================================== --- /dev/null +++ test/clang-tidy/modernize-use-default-member-init-bitfield.cpp @@ -0,0 +1,10 @@ +// RUN: %check_clang_tidy %s modernize-use-default-member-init %t -- -- -std=c++2a + +struct PositiveBitField +{ + PositiveBitField() : i(6) {} + // CHECK-FIXES: PositiveBitField() {} + int i : 5; + // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer for 'i' [modernize-use-default-member-init] + // CHECK-FIXES: int i : 5{6}; +}; Index: clang-tidy/modernize/UseDefaultMemberInitCheck.cpp =================================================================== --- clang-tidy/modernize/UseDefaultMemberInitCheck.cpp +++ clang-tidy/modernize/UseDefaultMemberInitCheck.cpp @@ -167,7 +167,9 @@ isDefaultConstructor(), unless(isInstantiated()), forEachConstructorInitializer( cxxCtorInitializer( - forField(unless(anyOf(isBitField(), + forField(unless(anyOf(getLangOpts().CPlusPlus2a + ? unless(anything()) + : isBitField(), hasInClassInitializer(anything()), hasParent(recordDecl(isUnion()))))), isWritten(), withInitializer(ignoringImplicit(Init)))
Index: test/clang-tidy/modernize-use-default-member-init-bitfield.cpp =================================================================== --- /dev/null +++ test/clang-tidy/modernize-use-default-member-init-bitfield.cpp @@ -0,0 +1,10 @@ +// RUN: %check_clang_tidy %s modernize-use-default-member-init %t -- -- -std=c++2a + +struct PositiveBitField +{ + PositiveBitField() : i(6) {} + // CHECK-FIXES: PositiveBitField() {} + int i : 5; + // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer for 'i' [modernize-use-default-member-init] + // CHECK-FIXES: int i : 5{6}; +}; Index: clang-tidy/modernize/UseDefaultMemberInitCheck.cpp =================================================================== --- clang-tidy/modernize/UseDefaultMemberInitCheck.cpp +++ clang-tidy/modernize/UseDefaultMemberInitCheck.cpp @@ -167,7 +167,9 @@ isDefaultConstructor(), unless(isInstantiated()), forEachConstructorInitializer( cxxCtorInitializer( - forField(unless(anyOf(isBitField(), + forField(unless(anyOf(getLangOpts().CPlusPlus2a + ? unless(anything()) + : isBitField(), hasInClassInitializer(anything()), hasParent(recordDecl(isUnion()))))), isWritten(), withInitializer(ignoringImplicit(Init)))
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits