Author: angelgarcia Date: Fri Nov 6 03:59:14 2015 New Revision: 252278 URL: http://llvm.org/viewvc/llvm-project?rev=252278&view=rev Log: Fix another case where loop-convert wasn't handling correctly data members.
Summary: If the container expression was obtained from the point where "size" (which usually is a const method) is invoked, then the topmost node in this expression may be an implicit cast to const. When the container is a data member, the check was trying to obtain the member expression directly and was failing in the case mentioned above. This is solved by ignoring implicit casts. Reviewers: klimek Subscribers: cfe-commits, alexfh Differential Revision: http://reviews.llvm.org/D14378 Modified: clang-tools-extra/trunk/clang-tidy/modernize/LoopConvertCheck.cpp clang-tools-extra/trunk/test/clang-tidy/modernize-loop-convert-extra.cpp Modified: clang-tools-extra/trunk/clang-tidy/modernize/LoopConvertCheck.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/modernize/LoopConvertCheck.cpp?rev=252278&r1=252277&r2=252278&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-tidy/modernize/LoopConvertCheck.cpp (original) +++ clang-tools-extra/trunk/clang-tidy/modernize/LoopConvertCheck.cpp Fri Nov 6 03:59:14 2015 @@ -352,12 +352,12 @@ static StringRef getStringFromRange(Sour LangOpts); } -/// \brief If the given expression is actually a DeclRefExpr, find and return -/// the underlying ValueDecl; otherwise, return NULL. +/// \brief If the given expression is actually a DeclRefExpr or a MemberExpr, +/// find and return the underlying ValueDecl; otherwise, return NULL. static const ValueDecl *getReferencedVariable(const Expr *E) { if (const DeclRefExpr *DRE = getDeclRef(E)) return dyn_cast<VarDecl>(DRE->getDecl()); - if (const auto *Mem = dyn_cast<MemberExpr>(E)) + if (const auto *Mem = dyn_cast<MemberExpr>(E->IgnoreParenImpCasts())) return dyn_cast<FieldDecl>(Mem->getMemberDecl()); return nullptr; } Modified: clang-tools-extra/trunk/test/clang-tidy/modernize-loop-convert-extra.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/modernize-loop-convert-extra.cpp?rev=252278&r1=252277&r2=252278&view=diff ============================================================================== --- clang-tools-extra/trunk/test/clang-tidy/modernize-loop-convert-extra.cpp (original) +++ clang-tools-extra/trunk/test/clang-tidy/modernize-loop-convert-extra.cpp Fri Nov 6 03:59:14 2015 @@ -240,6 +240,7 @@ void refs_and_vals() { struct MemberNaming { const static int N = 10; int Ints[N], Ints_[N]; + dependent<int> DInts; void loops() { for (int I = 0; I < N; ++I) { printf("%d\n", Ints[I]); @@ -254,8 +255,32 @@ struct MemberNaming { // CHECK-MESSAGES: :[[@LINE-3]]:5: warning: use range-based for loop instead // CHECK-FIXES: for (int Int : Ints_) // CHECK-FIXES-NEXT: printf("%d\n", Int); + + for (int I = 0; I < DInts.size(); ++I) { + printf("%d\n", DInts[I]); + } + // CHECK-MESSAGES: :[[@LINE-3]]:5: warning: use range-based for loop instead + // CHECK-FIXES: for (int DInt : DInts) + // CHECK-FIXES-NEXT: printf("%d\n", DInt); } + + void outOfLine(); }; +void MemberNaming::outOfLine() { + for (int I = 0; I < N; ++I) { + printf("%d\n", Ints[I]); + } + // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead + // CHECK-FIXES: for (int Int : Ints) + // CHECK-FIXES-NEXT: printf("%d\n", Int); + + for (int I = 0; I < N; ++I) { + printf("%d\n", Ints_[I]); + } + // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead + // CHECK-FIXES: for (int Int : Ints_) + // CHECK-FIXES-NEXT: printf("%d\n", Int); +} } // namespace NamingAlias _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
