[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
This revision was automatically updated to reflect the committed changes.
Closed by commit rGe43295209bb8: [clang-tidy] Match derived types in in
modernize-loop-convert (authored by ccotter, committed by carlosgalvezp).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140307/new/
https://reviews.llvm.org/D140307
Files:
clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
clang-tools-extra/docs/ReleaseNotes.rst
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
Index:
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
===
--- clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
@@ -575,6 +575,7 @@
const dependent *Pconstv;
transparent> Cv;
+dependent_derived VD;
void f() {
int Sum = 0;
@@ -653,6 +654,15 @@
// CHECK-FIXES: for (int I : V)
// CHECK-FIXES-NEXT: printf("Fibonacci number is %d\n", I);
// CHECK-FIXES-NEXT: Sum += I + 2;
+
+ for (int I = 0, E = VD.size(); E != I; ++I) {
+printf("Fibonacci number is %d\n", VD[I]);
+Sum += VD[I] + 2;
+ }
+ // CHECK-MESSAGES: :[[@LINE-4]]:3: warning: use range-based for loop instead
+ // CHECK-FIXES: for (int I : VD)
+ // CHECK-FIXES-NEXT: printf("Fibonacci number is %d\n", I);
+ // CHECK-FIXES-NEXT: Sum += I + 2;
}
// Ensure that 'const auto &' is used with containers of non-trivial types.
Index:
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
===
---
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
+++
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
@@ -126,6 +126,10 @@
void constFoo() const;
};
+template
+class dependent_derived : public dependent {
+};
+
template
class doublyDependent{
public:
Index: clang-tools-extra/docs/ReleaseNotes.rst
===
--- clang-tools-extra/docs/ReleaseNotes.rst
+++ clang-tools-extra/docs/ReleaseNotes.rst
@@ -216,6 +216,10 @@
:doc: `readability-redundant-string-cstr
`
check.
+- Improved :doc:`modernize-loop-convert
`
+ to check for container functions ``begin``/``end`` etc on base classes of
the container
+ type, instead of only as direct members of the container type itself.
+
Removed checks
^^
Index: clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
===
--- clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
+++ clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
@@ -252,17 +252,18 @@
// functions called begin() and end() taking the container as an argument
// are also allowed.
TypeMatcher RecordWithBeginEnd = qualType(anyOf(
- qualType(
- isConstQualified(),
- hasUnqualifiedDesugaredType(recordType(hasDeclaration(cxxRecordDecl(
- hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
- hasMethod(cxxMethodDecl(hasName("end"),
- isConst() // hasDeclaration
- ))), // qualType
+ qualType(isConstQualified(),
+ hasUnqualifiedDesugaredType(recordType(hasDeclaration(
+ cxxRecordDecl(isSameOrDerivedFrom(cxxRecordDecl(
+ hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
+ hasMethod(cxxMethodDecl(hasName("end"),
+ isConst())) //
hasDeclaration
+ ))), // qualType
qualType(unless(isConstQualified()),
hasUnqualifiedDesugaredType(recordType(hasDeclaration(
- cxxRecordDecl(hasMethod(hasName("begin")),
- hasMethod(hasName("end"))) // qualType
+ cxxRecordDecl(isSameOrDerivedFrom(cxxRecordDecl(
+ hasMethod(hasName("begin")),
+ hasMethod(hasName("end") // qualType
));
StatementMatcher SizeCallMatcher = cxxMemberCallExpr(
Index: clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
===
--- clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
@@ -575,6 +575,7 @@
const dependent *Pconstv;
transparent> Cv;
+dependent_derived VD;
void f() {
int Sum = 0;
@@ -653,6 +654,15 @@
// CHECK-FIXES: for (int I :
[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
ccotter added a comment. Rebased! Sorry for the multiple diffs on this phab - I'm still getting the hang of `arc diff`. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D140307/new/ https://reviews.llvm.org/D140307 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
ccotter updated this revision to Diff 487781.
ccotter added a comment.
rebase?
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140307/new/
https://reviews.llvm.org/D140307
Files:
clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
clang-tools-extra/docs/ReleaseNotes.rst
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
Index:
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
===
--- clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
@@ -575,6 +575,7 @@
const dependent *Pconstv;
transparent> Cv;
+dependent_derived VD;
void f() {
int Sum = 0;
@@ -653,6 +654,15 @@
// CHECK-FIXES: for (int I : V)
// CHECK-FIXES-NEXT: printf("Fibonacci number is %d\n", I);
// CHECK-FIXES-NEXT: Sum += I + 2;
+
+ for (int I = 0, E = VD.size(); E != I; ++I) {
+printf("Fibonacci number is %d\n", VD[I]);
+Sum += VD[I] + 2;
+ }
+ // CHECK-MESSAGES: :[[@LINE-4]]:3: warning: use range-based for loop instead
+ // CHECK-FIXES: for (int I : VD)
+ // CHECK-FIXES-NEXT: printf("Fibonacci number is %d\n", I);
+ // CHECK-FIXES-NEXT: Sum += I + 2;
}
// Ensure that 'const auto &' is used with containers of non-trivial types.
Index:
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
===
---
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
+++
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
@@ -126,6 +126,10 @@
void constFoo() const;
};
+template
+class dependent_derived : public dependent {
+};
+
template
class doublyDependent{
public:
Index: clang-tools-extra/docs/ReleaseNotes.rst
===
--- clang-tools-extra/docs/ReleaseNotes.rst
+++ clang-tools-extra/docs/ReleaseNotes.rst
@@ -216,6 +216,10 @@
:doc: `readability-redundant-string-cstr
`
check.
+- Improved :doc:`modernize-loop-convert
`
+ to check for container functions ``begin``/``end`` etc on base classes of
the container
+ type, instead of only as direct members of the container type itself.
+
Removed checks
^^
Index: clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
===
--- clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
+++ clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
@@ -252,17 +252,18 @@
// functions called begin() and end() taking the container as an argument
// are also allowed.
TypeMatcher RecordWithBeginEnd = qualType(anyOf(
- qualType(
- isConstQualified(),
- hasUnqualifiedDesugaredType(recordType(hasDeclaration(cxxRecordDecl(
- hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
- hasMethod(cxxMethodDecl(hasName("end"),
- isConst() // hasDeclaration
- ))), // qualType
+ qualType(isConstQualified(),
+ hasUnqualifiedDesugaredType(recordType(hasDeclaration(
+ cxxRecordDecl(isSameOrDerivedFrom(cxxRecordDecl(
+ hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
+ hasMethod(cxxMethodDecl(hasName("end"),
+ isConst())) //
hasDeclaration
+ ))), // qualType
qualType(unless(isConstQualified()),
hasUnqualifiedDesugaredType(recordType(hasDeclaration(
- cxxRecordDecl(hasMethod(hasName("begin")),
- hasMethod(hasName("end"))) // qualType
+ cxxRecordDecl(isSameOrDerivedFrom(cxxRecordDecl(
+ hasMethod(hasName("begin")),
+ hasMethod(hasName("end") // qualType
));
StatementMatcher SizeCallMatcher = cxxMemberCallExpr(
Index: clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
===
--- clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
@@ -575,6 +575,7 @@
const dependent *Pconstv;
transparent> Cv;
+dependent_derived VD;
void f() {
int Sum = 0;
@@ -653,6 +654,15 @@
// CHECK-FIXES: for (int I : V)
// CHECK-FIXES-NEXT: printf("Fibonacci number is %d\n", I);
// CHECK-FIXES-NEXT: Sum += I + 2;
+
+ for (int I = 0, E = VD.size();
[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
ccotter updated this revision to Diff 487778. ccotter added a comment. rebase Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D140307/new/ https://reviews.llvm.org/D140307 Files: clang-tools-extra/docs/ReleaseNotes.rst Index: clang-tools-extra/docs/ReleaseNotes.rst === --- clang-tools-extra/docs/ReleaseNotes.rst +++ clang-tools-extra/docs/ReleaseNotes.rst @@ -216,7 +216,7 @@ :doc: `readability-redundant-string-cstr ` check. -- Improved :doc:`misc-redundant-expression ` +- Improved :doc:`modernize-loop-convert ` to check for container functions ``begin``/``end`` etc on base classes of the container type, instead of only as direct members of the container type itself. Index: clang-tools-extra/docs/ReleaseNotes.rst === --- clang-tools-extra/docs/ReleaseNotes.rst +++ clang-tools-extra/docs/ReleaseNotes.rst @@ -216,7 +216,7 @@ :doc: `readability-redundant-string-cstr ` check. -- Improved :doc:`misc-redundant-expression ` +- Improved :doc:`modernize-loop-convert ` to check for container functions ``begin``/``end`` etc on base classes of the container type, instead of only as direct members of the container type itself. ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
carlosgalvezp added a comment. Hi! I'm finding merge conflicts when rebasing the patch on latest trunk, would you mind uploading a rebased version? Thanks! Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D140307/new/ https://reviews.llvm.org/D140307 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
carlosgalvezp accepted this revision.
carlosgalvezp added a comment.
This revision is now accepted and ready to land.
LGTM, let's give @njames93 a few days in case he has some comments.
Comment at: clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp:258
+ hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
+ hasMethod(cxxMethodDecl(hasName("end"),
+ isConst())) //
hasDeclaration
ccotter wrote:
> ccotter wrote:
> > carlosgalvezp wrote:
> > > Replace tabs with spaces
> > Ah, I think this was before I figured out `arc diff` and was copy/pasting
> > diff files around :/
> >
> > Thanks for catching this.
> just to confirm, how did you notice the tabs? I couldnt find them when I
> downloaded the phab raw diff for any of the versions in the history. I still
> see a double right arrow `»` in the phab diff - is that indicating a tab or
> something else?
>
> As a sanity check, I ran `./clang/tools/clang-format/git-clang-format
> --binary build/bin/clang-format` from the root of my project and the tool did
> not produce any changes with the latest version of the changes I submitted.
You are right, it must be a bug in Phabricator!
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140307/new/
https://reviews.llvm.org/D140307
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
ccotter marked an inline comment as done.
ccotter added inline comments.
Comment at: clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp:258
+ hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
+ hasMethod(cxxMethodDecl(hasName("end"),
+ isConst())) //
hasDeclaration
ccotter wrote:
> carlosgalvezp wrote:
> > Replace tabs with spaces
> Ah, I think this was before I figured out `arc diff` and was copy/pasting
> diff files around :/
>
> Thanks for catching this.
just to confirm, how did you notice the tabs? I couldnt find them when I
downloaded the phab raw diff for any of the versions in the history. I still
see a double right arrow `»` in the phab diff - is that indicating a tab or
something else?
As a sanity check, I ran `./clang/tools/clang-format/git-clang-format --binary
build/bin/clang-format` from the root of my project and the tool did not
produce any changes with the latest version of the changes I submitted.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140307/new/
https://reviews.llvm.org/D140307
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
ccotter marked 2 inline comments as done.
ccotter added inline comments.
Comment at: clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp:258
+ hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
+ hasMethod(cxxMethodDecl(hasName("end"),
+ isConst())) //
hasDeclaration
carlosgalvezp wrote:
> Replace tabs with spaces
Ah, I think this was before I figured out `arc diff` and was copy/pasting diff
files around :/
Thanks for catching this.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140307/new/
https://reviews.llvm.org/D140307
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
ccotter updated this revision to Diff 486716.
ccotter added a comment.
- Match derived types in in modernize-loop-convert
- fix typo
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140307/new/
https://reviews.llvm.org/D140307
Files:
clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
clang-tools-extra/docs/ReleaseNotes.rst
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
Index:
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
===
--- clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
@@ -575,6 +575,7 @@
const dependent *Pconstv;
transparent> Cv;
+dependent_derived VD;
void f() {
int Sum = 0;
@@ -653,6 +654,15 @@
// CHECK-FIXES: for (int I : V)
// CHECK-FIXES-NEXT: printf("Fibonacci number is %d\n", I);
// CHECK-FIXES-NEXT: Sum += I + 2;
+
+ for (int I = 0, E = VD.size(); E != I; ++I) {
+printf("Fibonacci number is %d\n", VD[I]);
+Sum += VD[I] + 2;
+ }
+ // CHECK-MESSAGES: :[[@LINE-4]]:3: warning: use range-based for loop instead
+ // CHECK-FIXES: for (int I : VD)
+ // CHECK-FIXES-NEXT: printf("Fibonacci number is %d\n", I);
+ // CHECK-FIXES-NEXT: Sum += I + 2;
}
// Ensure that 'const auto &' is used with containers of non-trivial types.
Index:
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
===
---
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
+++
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
@@ -126,6 +126,10 @@
void constFoo() const;
};
+template
+class dependent_derived : public dependent {
+};
+
template
class doublyDependent{
public:
Index: clang-tools-extra/docs/ReleaseNotes.rst
===
--- clang-tools-extra/docs/ReleaseNotes.rst
+++ clang-tools-extra/docs/ReleaseNotes.rst
@@ -204,6 +204,10 @@
The check now skips concept definitions since redundant expressions still
make sense
inside them.
+- Improved :doc:`modernize-loop-convert
`
+ to check for container functions ``begin``/``end`` etc on base classes of
the container
+ type, instead of only as direct members of the container type itself.
+
Removed checks
^^
Index: clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
===
--- clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
+++ clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
@@ -251,17 +251,18 @@
// functions called begin() and end() taking the container as an argument
// are also allowed.
TypeMatcher RecordWithBeginEnd = qualType(anyOf(
- qualType(
- isConstQualified(),
- hasUnqualifiedDesugaredType(recordType(hasDeclaration(cxxRecordDecl(
- hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
- hasMethod(cxxMethodDecl(hasName("end"),
- isConst() // hasDeclaration
- ))), // qualType
+ qualType(isConstQualified(),
+ hasUnqualifiedDesugaredType(recordType(hasDeclaration(
+ cxxRecordDecl(isSameOrDerivedFrom(cxxRecordDecl(
+ hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
+ hasMethod(cxxMethodDecl(hasName("end"),
+ isConst())) //
hasDeclaration
+ ))), // qualType
qualType(unless(isConstQualified()),
hasUnqualifiedDesugaredType(recordType(hasDeclaration(
- cxxRecordDecl(hasMethod(hasName("begin")),
- hasMethod(hasName("end"))) // qualType
+ cxxRecordDecl(isSameOrDerivedFrom(cxxRecordDecl(
+ hasMethod(hasName("begin")),
+ hasMethod(hasName("end") // qualType
));
StatementMatcher SizeCallMatcher = cxxMemberCallExpr(
Index: clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
===
--- clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
@@ -575,6 +575,7 @@
const dependent *Pconstv;
transparent> Cv;
+dependent_derived VD;
void f() {
int Sum = 0;
@@ -653,6 +654,15 @@
// CHECK-FIXES: for (int I : V)
// CHECK-FIXES-NEXT: printf("Fib
[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
carlosgalvezp added inline comments.
Comment at: clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp:258
+ hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
+ hasMethod(cxxMethodDecl(hasName("end"),
+ isConst())) //
hasDeclaration
Replace tabs with spaces
Comment at: clang-tools-extra/docs/ReleaseNotes.rst:207
+- Improved :doc:`misc-redundant-expression
`
+ to check for container functions ``begin``/``end`` etc on base classes of
the container
Copy-paste typo?
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140307/new/
https://reviews.llvm.org/D140307
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D140307: [clang-tidy] Match derived types in in modernize-loop-convert
ccotter updated this revision to Diff 485637.
ccotter added a comment.
Add release note
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140307/new/
https://reviews.llvm.org/D140307
Files:
clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
clang-tools-extra/docs/ReleaseNotes.rst
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
Index:
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
===
--- clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
@@ -575,6 +575,7 @@
const dependent *Pconstv;
transparent> Cv;
+dependent_derived VD;
void f() {
int Sum = 0;
@@ -653,6 +654,15 @@
// CHECK-FIXES: for (int I : V)
// CHECK-FIXES-NEXT: printf("Fibonacci number is %d\n", I);
// CHECK-FIXES-NEXT: Sum += I + 2;
+
+ for (int I = 0, E = VD.size(); E != I; ++I) {
+printf("Fibonacci number is %d\n", VD[I]);
+Sum += VD[I] + 2;
+ }
+ // CHECK-MESSAGES: :[[@LINE-4]]:3: warning: use range-based for loop instead
+ // CHECK-FIXES: for (int I : VD)
+ // CHECK-FIXES-NEXT: printf("Fibonacci number is %d\n", I);
+ // CHECK-FIXES-NEXT: Sum += I + 2;
}
// Ensure that 'const auto &' is used with containers of non-trivial types.
Index:
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
===
---
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
+++
clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
@@ -126,6 +126,10 @@
void constFoo() const;
};
+template
+class dependent_derived : public dependent {
+};
+
template
class doublyDependent{
public:
Index: clang-tools-extra/docs/ReleaseNotes.rst
===
--- clang-tools-extra/docs/ReleaseNotes.rst
+++ clang-tools-extra/docs/ReleaseNotes.rst
@@ -204,6 +204,10 @@
The check now skips concept definitions since redundant expressions still
make sense
inside them.
+- Improved :doc:`misc-redundant-expression
`
+ to check for container functions ``begin``/``end`` etc on base classes of
the container
+ type, instead of only as direct members of the container type itself.
+
Removed checks
^^
Index: clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
===
--- clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
+++ clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
@@ -251,17 +251,18 @@
// functions called begin() and end() taking the container as an argument
// are also allowed.
TypeMatcher RecordWithBeginEnd = qualType(anyOf(
- qualType(
- isConstQualified(),
- hasUnqualifiedDesugaredType(recordType(hasDeclaration(cxxRecordDecl(
- hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
- hasMethod(cxxMethodDecl(hasName("end"),
- isConst() // hasDeclaration
- ))), // qualType
+ qualType(isConstQualified(),
+ hasUnqualifiedDesugaredType(recordType(hasDeclaration(
+ cxxRecordDecl(isSameOrDerivedFrom(cxxRecordDecl(
+ hasMethod(cxxMethodDecl(hasName("begin"), isConst())),
+ hasMethod(cxxMethodDecl(hasName("end"),
+ isConst())) //
hasDeclaration
+ ))), // qualType
qualType(unless(isConstQualified()),
hasUnqualifiedDesugaredType(recordType(hasDeclaration(
- cxxRecordDecl(hasMethod(hasName("begin")),
- hasMethod(hasName("end"))) // qualType
+ cxxRecordDecl(isSameOrDerivedFrom(cxxRecordDecl(
+ hasMethod(hasName("begin")),
+ hasMethod(hasName("end") // qualType
));
StatementMatcher SizeCallMatcher = cxxMemberCallExpr(
Index: clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
===
--- clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
@@ -575,6 +575,7 @@
const dependent *Pconstv;
transparent> Cv;
+dependent_derived VD;
void f() {
int Sum = 0;
@@ -653,6 +654,15 @@
// CHECK-FIXES: for (int I : V)
// CHECK-FIXES-NEXT: printf("Fibonacci number is %d\n", I);
// CHECK-FI
