diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h b/clang/include/clang/AST/RecursiveASTVisitor.h --- a/clang/include/clang/AST/RecursiveASTVisitor.h +++ b/clang/include/clang/AST/RecursiveASTVisitor.h @@ -2023,7 +2023,8 @@ if (CXXConstructorDecl *Ctor = dyn_cast(D)) { // Constructor initializers. for (auto *I : Ctor->inits()) { - TRY_TO(TraverseConstructorInitializer(I)); + if (I->isWritten() || getDerived().shouldVisitImplicitCode()) + TRY_TO(TraverseConstructorInitializer(I)); } } diff --git a/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp b/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp new file mode 100644 --- /dev/null +++ b/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp @@ -0,0 +1,58 @@ +//===- 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 { + +// 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. +class CXXCtorInitializerVisitor + : public ExpectedLocationVisitor { +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; +}; + +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