diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2013-04-03 19:58:29 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2013-04-03 19:58:29 +0200 |
| commit | 44cb3d5b6f17dd38d2dd484cd293dd8464808310 (patch) | |
| tree | b61558587e30a5efeb979cacef62a8a30a290e8f | |
| parent | 4b10ee0ba7fa4b623b7bb8bfe981cf26783cf2c5 (diff) | |
backport: re PR c++/54858 (ICE in cp_tree_equal)
Backported from mainline
2012-10-08 Jakub Jelinek <jakub@redhat.com>
PR c++/54858
* tree.c (cp_tree_equal): Handle FIELD_DECL.
* g++.dg/template/pr54858.C: New test.
From-SVN: r197445
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/pr54858.C | 21 |
4 files changed, 35 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5a4d95fea8b..1808b9d09cc 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2013-04-03 Jakub Jelinek <jakub@redhat.com> + + Backported from mainline + 2012-10-08 Jakub Jelinek <jakub@redhat.com> + + PR c++/54858 + * tree.c (cp_tree_equal): Handle FIELD_DECL. + 2013-03-14 Jakub Jelinek <jakub@redhat.com> PR c++/56403 diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 0ff576ade90..3d55aea5b5d 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -2265,6 +2265,7 @@ cp_tree_equal (tree t1, tree t2) case VAR_DECL: case CONST_DECL: + case FIELD_DECL: case FUNCTION_DECL: case TEMPLATE_DECL: case IDENTIFIER_NODE: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 99e28b1b929..43de522fccd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2013-04-03 Jakub Jelinek <jakub@redhat.com> Backported from mainline + 2012-10-08 Jakub Jelinek <jakub@redhat.com> + + PR c++/54858 + * g++.dg/template/pr54858.C: New test. + 2012-09-05 Jakub Jelinek <jakub@redhat.com> PR middle-end/54486 diff --git a/gcc/testsuite/g++.dg/template/pr54858.C b/gcc/testsuite/g++.dg/template/pr54858.C new file mode 100644 index 00000000000..51610ad689a --- /dev/null +++ b/gcc/testsuite/g++.dg/template/pr54858.C @@ -0,0 +1,21 @@ +// PR c++/54858 +// { dg-do compile } + +template <int> struct A {}; +template <typename T, T *> struct B {}; +template <typename D> struct C +{ + A<0> c0; B<A<0>, &C::c0> d0; // { dg-error "could not convert template argument" } + A<0> c1; B<A<0>, &C::c1> d1; // { dg-error "could not convert template argument" } + A<0> c2; B<A<0>, &C::c2> d2; // { dg-error "could not convert template argument" } + A<0> c3; B<A<0>, &C::c3> d3; // { dg-error "could not convert template argument" } + A<0> c4; B<A<0>, &C::c4> d4; // { dg-error "could not convert template argument" } + A<0> c5; B<A<0>, &C::c5> d5; // { dg-error "could not convert template argument" } + A<0> c6; B<A<0>, &C::c6> d6; // { dg-error "could not convert template argument" } + A<0> c7; B<A<0>, &C::c7> d7; // { dg-error "could not convert template argument" } + A<0> c8; B<A<0>, &C::c8> d8; // { dg-error "could not convert template argument" } + A<0> c9; B<A<0>, &C::c9> d9; // { dg-error "could not convert template argument" } + A<0> ca; B<A<0>, &C::ca> da; // { dg-error "could not convert template argument" } + A<0> cb; B<A<0>, &C::cb> db; // { dg-error "could not convert template argument" } +}; +C<int> e; |