diff options
| author | Marek Polacek <polacek@redhat.com> | 2018-06-05 13:11:00 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2018-06-05 13:11:00 +0000 |
| commit | 05f9a806ee423a6dc7995c1c1bfe18c97c80c5c4 (patch) | |
| tree | eaef443648e01b9ff10c57c24e39ed0138c7f472 /gcc | |
| parent | 97a53d1d04d5dc36f64c0897ff0c49c78ef83ffc (diff) | |
| download | gcc-05f9a806ee423a6dc7995c1c1bfe18c97c80c5c4.zip gcc-05f9a806ee423a6dc7995c1c1bfe18c97c80c5c4.tar.gz gcc-05f9a806ee423a6dc7995c1c1bfe18c97c80c5c4.tar.bz2 | |
re PR c++/85976 (ICE in cp_tree_equal when building Blitz. May be nested templates.)
PR c++/85976
* tree.c (cp_tree_equal): Handle USING_DECL.
* g++.dg/cpp0x/alias-decl-64.C: New test.
From-SVN: r261200
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/alias-decl-64.C | 15 |
4 files changed, 33 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f4fa21a..4962eac 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2018-06-05 Marek Polacek <polacek@redhat.com> + + PR c++/85976 + * tree.c (cp_tree_equal): Handle USING_DECL. + 2018-06-05 Jason Merrill <jason@redhat.com> PR c++/85731 - wrong error with qualified-id in template. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index c5b6e96..bbbda7e 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -3878,6 +3878,14 @@ cp_tree_equal (tree t1, tree t2) DEFERRED_NOEXCEPT_ARGS (t2))); break; + case USING_DECL: + if (DECL_DEPENDENT_P (t1) && DECL_DEPENDENT_P (t2)) + return (cp_tree_equal (USING_DECL_SCOPE (t1), + USING_DECL_SCOPE (t2)) + && cp_tree_equal (DECL_NAME (t1), + DECL_NAME (t2))); + return false; + default: break; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2cacaa2..a049d14 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-06-05 Marek Polacek <polacek@redhat.com> + + PR c++/85976 + * g++.dg/cpp0x/alias-decl-64.C: New test. + 2018-06-05 Richard Biener <rguenther@suse.de> PR tree-optimization/86046 diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-64.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-64.C new file mode 100644 index 0000000..019eb26 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-64.C @@ -0,0 +1,15 @@ +// PR c++/85976 +// { dg-do compile { target c++11 } } + +template <int> class A; +template <typename> class B; +template <typename> struct C; +template <typename P_expr> class D { + using B<typename P_expr::T_numtype>::rank_; + void operator()(typename C<A<rank_>>::i); +}; + +template <typename P_expr> class F { + using B<typename P_expr::T_numtype>::rank_; + void operator()(typename C<A<rank_>>::i); +}; |