clang-tidy: Count template constructors in modernize-use-default-member-init

[MarcoFalke]

Summary

The check should bomb out when there are multiple constructors. However, it didn't count template constructors.

Add a negative test case TwoConstructorsTpl and make it pass.

[MarcoFalke]

Simplify patch and remove test case failing on Windows, but passing on Linux

[MarcoFalke]

Remove both test cases that pass on current main on Linux, but fail on Windows. Seems unrelated to add/fix them here.

[oleg.smolsky]

Nice!

[carlosgalvezp]

Looks good, thanks! Please document change in the Release Notes.

[MarcoFalke]

Thanks. Added release note. Lmk if I should go ahead and merge this.

[MarcoFalke]

mv release note, rebase

[carlosgalvezp]

Thanks for the fix!

clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp

 
 void UseDefaultMemberInitCheck::checkDefaultInit(
     const MatchFinder::MatchResult &Result, const CXXCtorInitializer *Init) {
   const FieldDecl *Field = Init->getAnyMember();
 
   // Check whether we have multiple hand-written constructors and bomb out, as
   // it is hard to reconcile their sets of member initializers.
   const auto *ClassDecl = cast<CXXRecordDecl>(Field->getParent());
-  if (llvm::count_if(ClassDecl->ctors(), [](const CXXConstructorDecl *Ctor) {
+  if (llvm::count_if(ClassDecl->decls(), [](const Decl *D) {
+        if (const auto *FTD = dyn_cast<FunctionTemplateDecl>(D))
+          D = FTD->getTemplatedDecl();
+        if (const auto *Ctor = dyn_cast<CXXConstructorDecl>(D))
           return !Ctor->isCopyOrMoveConstructor();
+        return false;
       }) > 1)
     return;
 
   SourceLocation StartLoc = Field->getBeginLoc();
   if (StartLoc.isMacroID() && IgnoreMacros)
     return;
 
   SourceLocation FieldEnd =

clang-tools-extra/docs/ReleaseNotes.rst

- Deprecated check-local options `HeaderFileExtensions`
   <clang-tidy/checks/misc/definitions-in-headers>` check.
   Global options of the same name should be used instead.
 
 - Deprecated check-local options `HeaderFileExtensions`
   in :doc:`misc-unused-using-decls
   <clang-tidy/checks/misc/unused-using-decls>` check.
   Global options of the same name should be used instead.
 
+- In :doc:`modernize-use-default-member-init
+  <clang-tidy/checks/modernize/use-default-member-init>` count template
+  constructors toward hand written constructors so that they are skipped if more
+  than one exists.
+
 - Fixed reading `HungarianNotation.CString.*` options in
   :doc:`readability-identifier-naming
   <clang-tidy/checks/readability/identifier-naming>` check.
 
 - Renamed `HungarianNotation.CString` options `CharPrinter` and
   `WideCharPrinter` to `CharPointer` and `WideCharPointer` respectively in
   :doc:`readability-identifier-naming
   <clang-tidy/checks/readability/identifier-naming>` check.

clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp

 
 // We cannot reconcile these initializers.
 struct TwoConstructors {
     TwoConstructors(int) : i(7) {}
     TwoConstructors(int, int) : i(8) {}
     int i;
 };
 
+struct TwoConstructorsTpl {
+  TwoConstructorsTpl() : i{7} {}
+  template <typename T> TwoConstructorsTpl(T, int) : i(8) {}
+  int i;
+};
+
 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) {}