diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-04-03 18:22:05 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-04-03 18:22:05 +0200 |
| commit | 92c59b7466a8caeab26f239ba4b004e68700d92e (patch) | |
| tree | e2e55e76cea712d7e3e9354332c4b68d04fe0f7e /gcc | |
| parent | 93e544c1024f6afd47deae2fc6042bb2dfefafee (diff) | |
| download | gcc-92c59b7466a8caeab26f239ba4b004e68700d92e.zip gcc-92c59b7466a8caeab26f239ba4b004e68700d92e.tar.gz gcc-92c59b7466a8caeab26f239ba4b004e68700d92e.tar.bz2 | |
re PR c++/85147 (ICE with invalid variadic template-template parameter)
PR c++/85147
* pt.c (fixed_parameter_pack_p_1): Punt if parm is error_mark_node.
* g++.dg/cpp0x/pr85147.C: New test.
From-SVN: r259040
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr85147.C | 9 |
4 files changed, 16 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d9406bf..ff3af26 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2018-04-03 Jakub Jelinek <jakub@redhat.com> + PR c++/85147 + * pt.c (fixed_parameter_pack_p_1): Punt if parm is error_mark_node. + PR c++/85140 * name-lookup.c (handle_namespace_attrs): Return early if attributes is error_mark_node. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 284eaf3..f4edb39 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5101,7 +5101,7 @@ static void fixed_parameter_pack_p_1 (tree parm, struct find_parameter_pack_data *ppd) { /* A type parm can't refer to another parm. */ - if (TREE_CODE (parm) == TYPE_DECL) + if (TREE_CODE (parm) == TYPE_DECL || parm == error_mark_node) return; else if (TREE_CODE (parm) == PARM_DECL) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e2a7cf2..70fd513 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2018-04-03 Jakub Jelinek <jakub@redhat.com> + PR c++/85147 + * g++.dg/cpp0x/pr85147.C: New test. + PR c++/85140 * g++.dg/cpp0x/gen-attrs-64.C: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/pr85147.C b/gcc/testsuite/g++.dg/cpp0x/pr85147.C new file mode 100644 index 0000000..68c0022 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr85147.C @@ -0,0 +1,9 @@ +// PR c++/85147 +// { dg-do compile { target c++11 } } + +template<typename T> struct A +{ + template<template<...T> class...> struct B {}; // { dg-error "expected|mismatch" } +}; + +A<int>::B<> b; // { dg-error "does not name a template type" } |