diff --git a/clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp --- a/clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp @@ -213,7 +213,6 @@ Finder->addMatcher( cxxConstructorDecl( - isDefaultConstructor(), forEachConstructorInitializer( cxxCtorInitializer( forField(unless(anyOf(getLangOpts().CPlusPlus20 diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp @@ -45,6 +45,38 @@ // CHECK-FIXES: int j{1}; }; +struct PositiveNotDefaultInt +{ + PositiveNotDefaultInt(int) : i(7) {} + // CHECK-FIXES: PositiveNotDefaultInt(int) {} + int i; + // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer for 'i' + // CHECK-FIXES: int i{7}; +}; + +struct PositiveNotDefaultOOLInt +{ + PositiveNotDefaultOOLInt(int); + int i; + // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer for 'i' + // CHECK-FIXES: int i{7}; +}; + +PositiveNotDefaultOOLInt::PositiveNotDefaultOOLInt(int) : i(7) {} +// CHECK-FIXES: PositiveNotDefaultOOLInt::PositiveNotDefaultOOLInt(int) {} + +struct PositiveNotDefaultOOLInt2 +{ + PositiveNotDefaultOOLInt2(int, int); + int i; + // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer for 'i' + // CHECK-FIXES: int i{7}; + int j; +}; + +PositiveNotDefaultOOLInt2::PositiveNotDefaultOOLInt2(int, int arg) : i(7), j(arg) {} +// CHECK-FIXES: PositiveNotDefaultOOLInt2::PositiveNotDefaultOOLInt2(int, int arg) : j(arg) {} + struct PositiveUnaryMinusInt { PositiveUnaryMinusInt() : j(-1) {} // CHECK-FIXES: PositiveUnaryMinusInt() {} @@ -234,12 +266,6 @@ int i : 5; }; -struct NegativeNotDefaultInt -{ - NegativeNotDefaultInt(int) : i(7) {} - int i; -}; - struct NegativeDefaultArg { NegativeDefaultArg(int i = 4) : i(i) {}