DEF_TRAVERSE_TYPELOC(RValueReferenceType,
{ TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
-// FIXME: location of base class?
// We traverse this in the type case as well, but how is it not reached through
// the pointee type?
DEF_TRAVERSE_TYPELOC(MemberPointerType, {
- TRY_TO(TraverseType(QualType(TL.getTypePtr()->getClass(), 0)));
+ if (auto *TSI = TL.getClassTInfo())
+ TRY_TO(TraverseTypeLoc(TSI->getTypeLoc()));
+ else
+ TRY_TO(TraverseType(QualType(TL.getTypePtr()->getClass(), 0)));
TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
})
RecursiveASTVisitorTests/LambdaDefaultCapture.cpp
RecursiveASTVisitorTests/LambdaExpr.cpp
RecursiveASTVisitorTests/LambdaTemplateParams.cpp
+ RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp
RecursiveASTVisitorTests/NestedNameSpecifiers.cpp
RecursiveASTVisitorTests/ParenExpr.cpp
RecursiveASTVisitorTests/TemplateArgumentLocTraverser.cpp
--- /dev/null
+//===- unittest/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.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 MemberPointerTypeLocVisitor
+ : public ExpectedLocationVisitor<MemberPointerTypeLocVisitor> {
+public:
+ bool VisitTemplateTypeParmTypeLoc(TemplateTypeParmTypeLoc TL) {
+ if (!TL)
+ return true;
+ Match(TL.getDecl()->getName(), TL.getNameLoc());
+ return true;
+ }
+ bool VisitRecordTypeLoc(RecordTypeLoc RTL) {
+ if (!RTL)
+ return true;
+ Match(RTL.getDecl()->getName(), RTL.getNameLoc());
+ return true;
+ }
+};
+
+TEST(RecursiveASTVisitor, VisitTypeLocInMemberPointerTypeLoc) {
+ MemberPointerTypeLocVisitor Visitor;
+ Visitor.ExpectMatch("Bar", 4, 36);
+ Visitor.ExpectMatch("T", 7, 23);
+ EXPECT_TRUE(Visitor.runOver(R"cpp(
+ class Bar { void func(int); };
+ class Foo {
+ void bind(const char*, void(Bar::*Foo)(int)) {}
+
+ template<typename T>
+ void test(void(T::*Foo)());
+ };
+ )cpp"));
+}
+
+TEST(RecursiveASTVisitor, NoCrash) {
+ MemberPointerTypeLocVisitor Visitor;
+ EXPECT_FALSE(Visitor.runOver(R"cpp(
+ // MemberPointerTypeLoc.getClassTInfo() is null.
+ class a(b(a::*)) class
+ )cpp"));
+}
+
+} // end anonymous namespace