[PATCH] D143375: clang-tidy: Count template constructors in modernize-use-default-member-init
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 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 @@
` check.
Global options of the same name should be used instead.
+- In :doc:`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
` 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(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(D))
+ D = FTD->getTemplatedDecl();
+if (const auto *Ctor = dyn_cast(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 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 @@
` check.
Global options of the same name should be used instead.
+- In :doc:`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
` 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(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(D))
+ D = FTD->getTemplatedDecl();
+if (const auto *Ctor = dyn_cast(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
[PATCH] D143375: clang-tidy: Count template constructors in modernize-use-default-member-init
carlosgalvezp accepted this revision. carlosgalvezp added a comment. This revision is now accepted and ready to land. Thanks for the fix! CHANGES SINCE LAST ACTION https://reviews.llvm.org/D143375/new/ https://reviews.llvm.org/D143375 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D143375: clang-tidy: Count template constructors in modernize-use-default-member-init
MarcoFalke updated this revision to Diff 501858.
MarcoFalke added a comment.
mv release note, rebase
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 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 @@
` check.
Global options of the same name should be used instead.
+- In :doc:`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
` 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(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(D))
+ D = FTD->getTemplatedDecl();
+if (const auto *Ctor = dyn_cast(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 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 @@
` check.
Global options of the same name should be used instead.
+- In :doc:`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
` 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(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(D))
+ D = FTD->getTemplatedDecl();
+if (const auto *Ctor = dyn_cast(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
[PATCH] D143375: clang-tidy: Count template constructors in modernize-use-default-member-init
MarcoFalke updated this revision to Diff 500716.
MarcoFalke added a comment.
Thanks. Added release note. Lmk if I should go ahead and merge this.
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 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
@@ -98,6 +98,9 @@
`ImplementationFileExtensions`, replacing the check-local options of the
same name.
+- In `modernize-use-default-member-init` count template constructors toward
+ hand written constructors so that they are skipped if more than one exists.
+
New checks
^^
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(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(D))
+ D = FTD->getTemplatedDecl();
+if (const auto *Ctor = dyn_cast(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 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
@@ -98,6 +98,9 @@
`ImplementationFileExtensions`, replacing the check-local options of the
same name.
+- In `modernize-use-default-member-init` count template constructors toward
+ hand written constructors so that they are skipped if more than one exists.
+
New checks
^^
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(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(D))
+ D = FTD->getTemplatedDecl();
+if (const auto *Ctor = dyn_cast(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
[PATCH] D143375: clang-tidy: Count template constructors in modernize-use-default-member-init
carlosgalvezp added a comment. Looks good, thanks! Please document change in the Release Notes. CHANGES SINCE LAST ACTION https://reviews.llvm.org/D143375/new/ https://reviews.llvm.org/D143375 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D143375: clang-tidy: Count template constructors in modernize-use-default-member-init
oleg.smolsky added a comment. Nice! CHANGES SINCE LAST ACTION https://reviews.llvm.org/D143375/new/ https://reviews.llvm.org/D143375 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D143375: clang-tidy: Count template constructors in modernize-use-default-member-init
MarcoFalke updated this revision to Diff 496104.
MarcoFalke edited the summary of this revision.
MarcoFalke added a comment.
Remove both test cases that pass on current `main` on Linux, but fail on
Windows. Seems unrelated to add/fix them here.
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/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 TwoConstructorsTpl(T, int) : i(8) {}
+ int i;
+};
+
struct PositiveNotDefaultOOLInt {
PositiveNotDefaultOOLInt(int);
int i;
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(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(D))
+ D = FTD->getTemplatedDecl();
+if (const auto *Ctor = dyn_cast(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 TwoConstructorsTpl(T, int) : i(8) {}
+ int i;
+};
+
struct PositiveNotDefaultOOLInt {
PositiveNotDefaultOOLInt(int);
int i;
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(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(D))
+ D = FTD->getTemplatedDecl();
+if (const auto *Ctor = dyn_cast(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
[PATCH] D143375: clang-tidy: Count template constructors in modernize-use-default-member-init
MarcoFalke updated this revision to Diff 496094.
MarcoFalke added a comment.
Simplify patch and remove test case failing on Windows, but passing on Linux
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/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 TwoConstructorsTpl(T, int) : i(8) {}
+ int i;
+};
+
struct PositiveNotDefaultOOLInt {
PositiveNotDefaultOOLInt(int);
int i;
@@ -237,6 +243,14 @@
NegativeTemplate nti;
NegativeTemplate ntd;
+template struct PositiveTemplate {
+ PositiveTemplate() : i(9) {}
+ // CHECK-FIXES: PositiveTemplate() {}
+ int i;
+ // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer
for 'i'
+ // CHECK-FIXES: int i{9};
+};
+
struct NegativeDefaultMember {
NegativeDefaultMember() {}
int i = 2;
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(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(D))
+ D = FTD->getTemplatedDecl();
+if (const auto *Ctor = dyn_cast(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 TwoConstructorsTpl(T, int) : i(8) {}
+ int i;
+};
+
struct PositiveNotDefaultOOLInt {
PositiveNotDefaultOOLInt(int);
int i;
@@ -237,6 +243,14 @@
NegativeTemplate nti;
NegativeTemplate ntd;
+template struct PositiveTemplate {
+ PositiveTemplate() : i(9) {}
+ // CHECK-FIXES: PositiveTemplate() {}
+ int i;
+ // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer for 'i'
+ // CHECK-FIXES: int i{9};
+};
+
struct NegativeDefaultMember {
NegativeDefaultMember() {}
int i = 2;
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(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(D))
+ D = FTD->getTemplatedDecl();
+if (const auto *Ctor = dyn_cast(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
[PATCH] D143375: clang-tidy: Count template constructors in modernize-use-default-member-init
MarcoFalke created this revision.
MarcoFalke added a project: clang-tools-extra.
Herald added a subscriber: carlosgalvezp.
Herald added a reviewer: njames93.
Herald added a project: All.
MarcoFalke requested review of this revision.
Herald added a subscriber: cfe-commits.
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.
Also, add more test cases with templates that were already passing on `main`.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D143375
Files:
clang-tools-extra/clang-tidy/modernize/UseDefaultMemberInitCheck.cpp
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,20 @@
int i;
};
+struct TwoConstructorsTpl {
+ TwoConstructorsTpl() : i{7} {}
+ template TwoConstructorsTpl(T, int) : i(8) {}
+ int i;
+};
+
+struct PositiveConstructorTpl {
+ template PositiveConstructorTpl(T, int) : i(8) {}
+ // CHECK-FIXES: PositiveConstructorTpl(T, int) {}
+ int i;
+ // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer
for 'i'
+ // CHECK-FIXES: int i{8};
+};
+
struct PositiveNotDefaultOOLInt {
PositiveNotDefaultOOLInt(int);
int i;
@@ -237,6 +251,14 @@
NegativeTemplate nti;
NegativeTemplate ntd;
+template struct PositiveTemplate {
+ PositiveTemplate() : i(9) {}
+ // CHECK-FIXES: PositiveTemplate() {}
+ int i;
+ // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer
for 'i'
+ // CHECK-FIXES: int i{9};
+};
+
struct NegativeDefaultMember {
NegativeDefaultMember() {}
int i = 2;
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(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 *Ctor = dyn_cast(D))
+ return !Ctor->isCopyOrMoveConstructor();
+if (const auto *FTD = dyn_cast(D))
+ return isa(FTD->getTemplatedDecl());
+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,20 @@
int i;
};
+struct TwoConstructorsTpl {
+ TwoConstructorsTpl() : i{7} {}
+ template TwoConstructorsTpl(T, int) : i(8) {}
+ int i;
+};
+
+struct PositiveConstructorTpl {
+ template PositiveConstructorTpl(T, int) : i(8) {}
+ // CHECK-FIXES: PositiveConstructorTpl(T, int) {}
+ int i;
+ // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer for 'i'
+ // CHECK-FIXES: int i{8};
+};
+
struct PositiveNotDefaultOOLInt {
PositiveNotDefaultOOLInt(int);
int i;
@@ -237,6 +251,14 @@
NegativeTemplate nti;
NegativeTemplate ntd;
+template struct PositiveTemplate {
+ PositiveTemplate() : i(9) {}
+ // CHECK-FIXES: PositiveTemplate() {}
+ int i;
+ // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use default member initializer for 'i'
+ // CHECK-FIXES: int i{9};
+};
+
struct NegativeDefaultMember {
NegativeDefaultMember() {}
int i = 2;
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(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 *Ctor = dyn_cast(D))
+ return !Ctor->isCopyOrMoveConstructor();
+if (const
