From d10be623838db6d82c7ede9ea5d4cf267ff2dc8f Mon Sep 17 00:00:00 2001 From: Martin Bohme Date: Mon, 1 Aug 2016 11:29:17 +0000 Subject: [PATCH] [clang-tidy] Prepare modernize-loop-convert for upcoming changes in D22566 Summary: D22566 will change RecursiveASTVisitor so that it descends into the initialization expressions for lambda captures. modernize-loop-convert needs to be prepared for this so that it does not interpret these initialization expressions as invalid uses of the loop variable. The change has no ill effects without D22566 in place, i.e. the change does not depend on D22566. Reviewers: klimek Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D22903 llvm-svn: 277339 --- clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp index 3fee2c4..55ca0d7 100644 --- a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp +++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp @@ -805,6 +805,18 @@ bool ForLoopIndexUseVisitor::VisitDeclStmt(DeclStmt *S) { } bool ForLoopIndexUseVisitor::TraverseStmt(Stmt *S) { + // If this is an initialization expression for a lambda capture, prune the + // traversal so that we don't end up diagnosing the contained DeclRefExpr as + // inconsistent usage. No need to record the usage here -- this is done in + // TraverseLambdaCapture(). + if (const auto *LE = dyn_cast_or_null(NextStmtParent)) { + // Any child of a LambdaExpr that isn't the body is an initialization + // expression. + if (S != LE->getBody()) { + return true; + } + } + // All this pointer swapping is a mechanism for tracking immediate parentage // of Stmts. const Stmt *OldNextParent = NextStmtParent; -- 2.7.4