shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[index] Fix crash when indexing a C++14 PCH/module related to TemplateTemplateParmDecls of alias templates

Browse Source 
TemplateTemplateParmDecls of alias templates ended-up serialized as 'file-level decls' which was causing a crash while trying to index a PCH/module file that contained them.
Commit makes sure TemplateTemplateParmDecls are not recorded as such kind of decls.

Fixes crash of rdar://36608297

Differential Revision: https://reviews.llvm.org/D42588

llvm-svn: 323549
This commit is contained in:
Argyrios Kyrtzidis 2018-01-26 19:26:12 +00:00
parent 1a1edbfb04
commit 71b74ebb1e
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Index/IndexDecl.cpp
View File

@ -664,8 +664,11 @@ public:
bool VisitTemplateDecl(const TemplateDecl *D) {
// Index the default values for the template parameters.
const NamedDecl *Parent = D->getTemplatedDecl();
if (!Parent)
return true;
// Index the default values for the template parameters.
if (D->getTemplateParameters() &&
shouldIndexTemplateParameterDefaultValue(Parent)) {
const TemplateParameterList *Params = D->getTemplateParameters();
@ -684,7 +687,7 @@ public:
}
}
return Visit(D->getTemplatedDecl());
return Visit(Parent);
}
bool VisitFriendDecl(const FriendDecl *D) {

4
clang/lib/Serialization/ASTWriter.cpp
View File

@ -5537,7 +5537,9 @@ void ASTWriter::associateDeclWithFile(const Decl *D, DeclID ID) {
return;
// FIXME: ParmVarDecls that are part of a function type of a parameter of
// a function/objc method, should not have TU as lexical context.
if (isa<ParmVarDecl>(D))
// TemplateTemplateParmDecls that are part of an alias template, should not
// have TU as lexical context.
if (isa<ParmVarDecl>(D) || isa<TemplateTemplateParmDecl>(D))
return;
SourceManager &SM = Context->getSourceManager();

17
clang/test/Index/Core/index-pch.cpp Normal file
View File

@ -0,0 +1,17 @@
// RUN: c-index-test core -print-source-symbols -- %s -std=c++14 | FileCheck %s
// RUN: %clang_cc1 -emit-pch %s -std=c++14 -o %t.pch
// RUN: c-index-test core -print-source-symbols -module-file %t.pch | FileCheck %s
// CHECK: [[@LINE+2]]:8 | struct(Gen)/C++ | DETECTOR | [[DETECTOR_USR:.*]] | {{.*}} | Def | rel: 0
template <class _Default, class _AlwaysVoid, template <class...> class _Op, class... _Args>
struct DETECTOR {
using value_t = int;
};
struct nonesuch {};
// CHECK: [[@LINE+4]]:9 | type-alias/C++ | is_detected
// CHECK: [[@LINE+3]]:32 | struct(Gen)/C++ | DETECTOR | [[DETECTOR_USR]] | {{.*}} | Ref,RelCont | rel: 1
// CHECK-NEXT: RelCont | is_detected
template <template<class...> class _Op, class... _Args>
using is_detected = typename DETECTOR<nonesuch, void, _Op, _Args...>::value_t;