Skip to content

Commit

Permalink
[Concepts] Add null check for TemplateTypeParmType::getDecl() in GetC…
Browse files Browse the repository at this point in the history
…ontainedInventedTypeParmVisitor

GetContainedInventedTypeParmVisitor would not account for the case where TemplateTypeParmType::getDecl() is
nullptr, causing bug #45102.

Add the nullptr check.

(cherry picked from commit 865456d)
  • Loading branch information
saarraz committed Mar 6, 2020
1 parent edcd83a commit 7c18c2f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion clang/lib/Sema/SemaTemplateInstantiate.cpp
Expand Up @@ -2162,7 +2162,7 @@ namespace {
// The deduced type itself.
TemplateTypeParmDecl *VisitTemplateTypeParmType(
const TemplateTypeParmType *T) {
if (!T->getDecl()->isImplicit())
if (!T->getDecl() || !T->getDecl()->isImplicit())
return nullptr;
return T->getDecl();
}
Expand Down
12 changes: 12 additions & 0 deletions clang/test/SemaTemplate/instantiate-abbreviated-template.cpp
Expand Up @@ -31,3 +31,15 @@ struct G {

using gf1 = decltype(G<int, char>::foo1('a', 1, 2, 3, 4)); // expected-error{{no matching function}}
using gf2 = decltype(G<int, char>::foo2('a', 1, 2)); // expected-error{{no matching function}}


// Regression (bug #45102): check that instantiation works where there is no
// TemplateTypeParmDecl
template <typename T> using id = T;

template <typename T>
constexpr void g() {
id<void (T)> f;
}

static_assert((g<int>(), true));

0 comments on commit 7c18c2f

Please sign in to comment.