diff options
| author | Jason Merrill <jason@redhat.com> | 2018-02-15 14:46:13 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-02-15 14:46:13 -0500 |
| commit | 117ad0be08050242d0235b586dc431038f04dcf0 (patch) | |
| tree | b4b0d24ae353c9a478506cd9ed605dd15dd885e5 /gcc | |
| parent | 8908fa3a7096dbb769f714647c5fc1d29b5d7cf2 (diff) | |
| download | gcc-117ad0be08050242d0235b586dc431038f04dcf0.zip gcc-117ad0be08050242d0235b586dc431038f04dcf0.tar.gz gcc-117ad0be08050242d0235b586dc431038f04dcf0.tar.bz2 | |
PR c++/84376 - ICE with omitted template arguments.
* pt.c (dguide_name_p): Check for IDENTIFIER_NODE.
From-SVN: r257706
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/class-deduction47.C | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5ecc8ab..5807374 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2018-02-15 Jason Merrill <jason@redhat.com> + PR c++/84376 - ICE with omitted template arguments. + * pt.c (dguide_name_p): Check for IDENTIFIER_NODE. + PR c++/84368 - wrong error with local variable in variadic lambda. * pt.c (tsubst_pack_expansion): Fix handling of non-packs in local_specializations. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index cd1aed8..268cfe5 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -25454,7 +25454,8 @@ dguide_name (tree tmpl) bool dguide_name_p (tree name) { - return (TREE_TYPE (name) + return (TREE_CODE (name) == IDENTIFIER_NODE + && TREE_TYPE (name) && !strncmp (IDENTIFIER_POINTER (name), dguide_base, strlen (dguide_base))); } diff --git a/gcc/testsuite/g++.dg/cpp1z/class-deduction47.C b/gcc/testsuite/g++.dg/cpp1z/class-deduction47.C new file mode 100644 index 0000000..3e47f58 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/class-deduction47.C @@ -0,0 +1,7 @@ +// PR c++/84376 + +template<int> struct A {}; + +template<typename T> T foo() { return T(); } + +template<> A foo<A>(); // { dg-error "A" } |