hokein created this revision. hokein added a reviewer: ilya-biryukov. Herald added subscribers: usaxena95, kadircet, arphaman, jkorous, mgorny. Herald added a project: clang.
added a unittest which causes "TL.getClassTInfo" is null. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D71186 Files: clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp clang/include/clang/AST/RecursiveASTVisitor.h clang/unittests/Tooling/CMakeLists.txt clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp
Index: clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp =================================================================== --- /dev/null +++ clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp @@ -0,0 +1,54 @@ +//===- 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( + class a(b(a::*)) class + )cpp")); +} + +} // end anonymous namespace Index: clang/unittests/Tooling/CMakeLists.txt =================================================================== --- clang/unittests/Tooling/CMakeLists.txt +++ clang/unittests/Tooling/CMakeLists.txt @@ -42,6 +42,7 @@ RecursiveASTVisitorTests/LambdaDefaultCapture.cpp RecursiveASTVisitorTests/LambdaExpr.cpp RecursiveASTVisitorTests/LambdaTemplateParams.cpp + RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp RecursiveASTVisitorTests/NestedNameSpecifiers.cpp RecursiveASTVisitorTests/ParenExpr.cpp RecursiveASTVisitorTests/TemplateArgumentLocTraverser.cpp Index: clang/include/clang/AST/RecursiveASTVisitor.h =================================================================== --- clang/include/clang/AST/RecursiveASTVisitor.h +++ clang/include/clang/AST/RecursiveASTVisitor.h @@ -1162,11 +1162,13 @@ 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())); }) Index: clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp =================================================================== --- clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp +++ clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp @@ -407,8 +407,8 @@ } )cpp", R"cpp( - template<typename $TemplateParameter[[T]], - void (T::*$TemplateParameter[[method]])(int)> + template<typename $TemplateParameter[[T]], + void ($TemplateParameter[[T]]::*$TemplateParameter[[method]])(int)> struct $Class[[G]] { void $Method[[foo]]( $TemplateParameter[[T]] *$Parameter[[O]]) {
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
