From 19eaff650c9c091e844f0a342540f1d10573772c Mon Sep 17 00:00:00 2001 From: Dmitri Gribenko Date: Fri, 3 Jul 2020 13:46:59 +0200 Subject: Revert RecursiveASTVisitor fixes. This reverts commit 8bf4c40af813e73de77739b33b8808f6bd13497b. This reverts commit 7b0be962d681c408c8ecf7180c6ad8f9fbcdaf2d. This reverts commit 94454442c3c15a67ae70ef3a73616632968973fc. Some compilers on some buildbots didn't accept the specialization of is_same_method_impl in a non-namespace scope. --- clang/lib/Tooling/Syntax/BuildTree.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'clang/lib/Tooling/Syntax/BuildTree.cpp') diff --git a/clang/lib/Tooling/Syntax/BuildTree.cpp b/clang/lib/Tooling/Syntax/BuildTree.cpp index 4371a30..8185af2 100644 --- a/clang/lib/Tooling/Syntax/BuildTree.cpp +++ b/clang/lib/Tooling/Syntax/BuildTree.cpp @@ -578,19 +578,15 @@ public: // RAV traverses it as a statement, we produce invalid node kinds in that // case. // FIXME: should do this in RAV instead? - bool Result = [&, this]() { - if (S->getInit() && !TraverseStmt(S->getInit())) - return false; - if (S->getLoopVariable() && !TraverseDecl(S->getLoopVariable())) - return false; - if (S->getRangeInit() && !TraverseStmt(S->getRangeInit())) - return false; - if (S->getBody() && !TraverseStmt(S->getBody())) - return false; - return true; - }(); - WalkUpFromCXXForRangeStmt(S); - return Result; + if (S->getInit() && !TraverseStmt(S->getInit())) + return false; + if (S->getLoopVariable() && !TraverseDecl(S->getLoopVariable())) + return false; + if (S->getRangeInit() && !TraverseStmt(S->getRangeInit())) + return false; + if (S->getBody() && !TraverseStmt(S->getBody())) + return false; + return true; } bool TraverseStmt(Stmt *S) { -- cgit v1.1