This revision was automatically updated to reflect the committed changes. jvikstrom marked an inline comment as done. Closed by commit rL367839: [AST] Fix RecursiveASTVisitor visiting implicit constructor initializers. (authored by jvikstrom, committed by ). Herald added a project: LLVM. Herald added a subscriber: llvm-commits.
Changed prior to commit: https://reviews.llvm.org/D65735?vs=213323&id=213329#toc Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D65735/new/ https://reviews.llvm.org/D65735 Files: cfe/trunk/include/clang/AST/RecursiveASTVisitor.h cfe/trunk/unittests/Tooling/CMakeLists.txt cfe/trunk/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp Index: cfe/trunk/include/clang/AST/RecursiveASTVisitor.h =================================================================== --- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h +++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h @@ -2023,7 +2023,8 @@ if (CXXConstructorDecl *Ctor = dyn_cast<CXXConstructorDecl>(D)) { // Constructor initializers. for (auto *I : Ctor->inits()) { - TRY_TO(TraverseConstructorInitializer(I)); + if (I->isWritten() || getDerived().shouldVisitImplicitCode()) + TRY_TO(TraverseConstructorInitializer(I)); } } Index: cfe/trunk/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp =================================================================== --- cfe/trunk/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp +++ cfe/trunk/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp @@ -0,0 +1,57 @@ +//=- unittest/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp -=// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "TestVisitor.h" + +using namespace clang; + +namespace { + +class CXXCtorInitializerVisitor + : public ExpectedLocationVisitor<CXXCtorInitializerVisitor> { +public: + CXXCtorInitializerVisitor(bool VisitImplicitCode) + : VisitImplicitCode(VisitImplicitCode) {} + + bool shouldVisitImplicitCode() const { return VisitImplicitCode; } + + bool TraverseConstructorInitializer(CXXCtorInitializer *Init) { + if (!Init->isWritten()) + VisitedImplicitInitializer = true; + Match("initializer", Init->getSourceLocation()); + return ExpectedLocationVisitor< + CXXCtorInitializerVisitor>::TraverseConstructorInitializer(Init); + } + + bool VisitedImplicitInitializer = false; + +private: + bool VisitImplicitCode; +}; + +// Check to ensure that CXXCtorInitializer is not visited when implicit code +// should not be visited and that it is visited when implicit code should be +// visited. +TEST(RecursiveASTVisitor, CXXCtorInitializerVisitNoImplicit) { + for (bool VisitImplCode : {true, false}) { + CXXCtorInitializerVisitor Visitor(VisitImplCode); + Visitor.ExpectMatch("initializer", 7, 17); + EXPECT_TRUE(Visitor.runOver(R"cpp( + class A {}; + class B : public A { + B() {}; + }; + class C : public A { + C() : A() {} + }; + )cpp", + CXXCtorInitializerVisitor::Lang_CXX)); + EXPECT_EQ(Visitor.VisitedImplicitInitializer, VisitImplCode); + } +} +} // end anonymous namespace Index: cfe/trunk/unittests/Tooling/CMakeLists.txt =================================================================== --- cfe/trunk/unittests/Tooling/CMakeLists.txt +++ cfe/trunk/unittests/Tooling/CMakeLists.txt @@ -31,6 +31,7 @@ RecursiveASTVisitorTests/CXXOperatorCallExprTraverser.cpp RecursiveASTVisitorTests/DeclRefExpr.cpp RecursiveASTVisitorTests/ImplicitCtor.cpp + RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp RecursiveASTVisitorTests/InitListExprPostOrder.cpp RecursiveASTVisitorTests/InitListExprPostOrderNoQueue.cpp RecursiveASTVisitorTests/InitListExprPreOrder.cpp
Index: cfe/trunk/include/clang/AST/RecursiveASTVisitor.h =================================================================== --- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h +++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h @@ -2023,7 +2023,8 @@ if (CXXConstructorDecl *Ctor = dyn_cast<CXXConstructorDecl>(D)) { // Constructor initializers. for (auto *I : Ctor->inits()) { - TRY_TO(TraverseConstructorInitializer(I)); + if (I->isWritten() || getDerived().shouldVisitImplicitCode()) + TRY_TO(TraverseConstructorInitializer(I)); } } Index: cfe/trunk/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp =================================================================== --- cfe/trunk/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp +++ cfe/trunk/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp @@ -0,0 +1,57 @@ +//=- unittest/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp -=// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "TestVisitor.h" + +using namespace clang; + +namespace { + +class CXXCtorInitializerVisitor + : public ExpectedLocationVisitor<CXXCtorInitializerVisitor> { +public: + CXXCtorInitializerVisitor(bool VisitImplicitCode) + : VisitImplicitCode(VisitImplicitCode) {} + + bool shouldVisitImplicitCode() const { return VisitImplicitCode; } + + bool TraverseConstructorInitializer(CXXCtorInitializer *Init) { + if (!Init->isWritten()) + VisitedImplicitInitializer = true; + Match("initializer", Init->getSourceLocation()); + return ExpectedLocationVisitor< + CXXCtorInitializerVisitor>::TraverseConstructorInitializer(Init); + } + + bool VisitedImplicitInitializer = false; + +private: + bool VisitImplicitCode; +}; + +// Check to ensure that CXXCtorInitializer is not visited when implicit code +// should not be visited and that it is visited when implicit code should be +// visited. +TEST(RecursiveASTVisitor, CXXCtorInitializerVisitNoImplicit) { + for (bool VisitImplCode : {true, false}) { + CXXCtorInitializerVisitor Visitor(VisitImplCode); + Visitor.ExpectMatch("initializer", 7, 17); + EXPECT_TRUE(Visitor.runOver(R"cpp( + class A {}; + class B : public A { + B() {}; + }; + class C : public A { + C() : A() {} + }; + )cpp", + CXXCtorInitializerVisitor::Lang_CXX)); + EXPECT_EQ(Visitor.VisitedImplicitInitializer, VisitImplCode); + } +} +} // end anonymous namespace Index: cfe/trunk/unittests/Tooling/CMakeLists.txt =================================================================== --- cfe/trunk/unittests/Tooling/CMakeLists.txt +++ cfe/trunk/unittests/Tooling/CMakeLists.txt @@ -31,6 +31,7 @@ RecursiveASTVisitorTests/CXXOperatorCallExprTraverser.cpp RecursiveASTVisitorTests/DeclRefExpr.cpp RecursiveASTVisitorTests/ImplicitCtor.cpp + RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp RecursiveASTVisitorTests/InitListExprPostOrder.cpp RecursiveASTVisitorTests/InitListExprPostOrderNoQueue.cpp RecursiveASTVisitorTests/InitListExprPreOrder.cpp
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits