This revision was automatically updated to reflect the committed changes.
Closed by commit rGfa491fefb0f8: clang-tidy: Count template constructors in
modernize-use-default-member-init (authored by MarcoFalke).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143375/new/
https://reviews.llvm.org/D143375
Files:
clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp
clang-tools-extra/docs/ReleaseNotes.rst
clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp
Index:
clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp
===================================================================
---
clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp
+++
clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp
@@ -60,6 +60,12 @@
int i;
};
+struct TwoConstructorsTpl {
+ TwoConstructorsTpl() : i{7} {}
+ template <typename T> TwoConstructorsTpl(T, int) : i(8) {}
+ int i;
+};
+
struct PositiveNotDefaultOOLInt {
PositiveNotDefaultOOLInt(int);
int i;
Index: clang-tools-extra/docs/ReleaseNotes.rst
===================================================================
--- clang-tools-extra/docs/ReleaseNotes.rst
+++ clang-tools-extra/docs/ReleaseNotes.rst
@@ -169,6 +169,11 @@
<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.
Index: clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp
+++ clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp
@@ -246,8 +246,12 @@
// 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) {
- return !Ctor->isCopyOrMoveConstructor();
+ 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;
Index: clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp
===================================================================
--- clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp
@@ -60,6 +60,12 @@
int i;
};
+struct TwoConstructorsTpl {
+ TwoConstructorsTpl() : i{7} {}
+ template <typename T> TwoConstructorsTpl(T, int) : i(8) {}
+ int i;
+};
+
struct PositiveNotDefaultOOLInt {
PositiveNotDefaultOOLInt(int);
int i;
Index: clang-tools-extra/docs/ReleaseNotes.rst
===================================================================
--- clang-tools-extra/docs/ReleaseNotes.rst
+++ clang-tools-extra/docs/ReleaseNotes.rst
@@ -169,6 +169,11 @@
<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.
Index: clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp
+++ clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp
@@ -246,8 +246,12 @@
// 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) {
- return !Ctor->isCopyOrMoveConstructor();
+ 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;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
