diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Index/IndexingContext.cpp | 6 | ||||
| -rw-r--r-- | clang/test/Index/Core/no-templated-canonical-decl.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/clang/lib/Index/IndexingContext.cpp b/clang/lib/Index/IndexingContext.cpp index c4aa51d62f0..addee691e80 100644 --- a/clang/lib/Index/IndexingContext.cpp +++ b/clang/lib/Index/IndexingContext.cpp @@ -260,8 +260,10 @@ static const Decl *adjustParent(const Decl *Parent) { static const Decl *getCanonicalDecl(const Decl *D) { D = D->getCanonicalDecl(); if (auto TD = dyn_cast<TemplateDecl>(D)) { - D = TD->getTemplatedDecl(); - assert(D->isCanonicalDecl()); + if (auto TTD = TD->getTemplatedDecl()) { + D = TTD; + assert(D->isCanonicalDecl()); + } } return D; diff --git a/clang/test/Index/Core/no-templated-canonical-decl.cpp b/clang/test/Index/Core/no-templated-canonical-decl.cpp new file mode 100644 index 00000000000..5434e9cb651 --- /dev/null +++ b/clang/test/Index/Core/no-templated-canonical-decl.cpp @@ -0,0 +1,4 @@ +// RUN: c-index-test core -print-source-symbols -include-locals -- %s | FileCheck %s + +template <template <typename> class A> class B { typedef A<int> A_int; }; +// CHECK: [[@LINE-1]]:46 | class(Gen)/C++ | B | c:@ST>1#t>1#T@B | <no-cgname> | Def | rel: 0 |
