diff options
| author | Kai Tietz <ktietz@redhat.com> | 2014-12-19 17:44:15 +0100 |
|---|---|---|
| committer | Kai Tietz <ktietz@gcc.gnu.org> | 2014-12-19 17:44:15 +0100 |
| commit | b00f4f15c1d592a3d00c6a1d3bc8d9f01baead36 (patch) | |
| tree | cca4bd93791bf80ac13d13a5f3a6a7409b2fb222 | |
| parent | 16f72d88dd84fd56a31eca8767a8f3c8d0fab88b (diff) | |
| download | gcc-b00f4f15c1d592a3d00c6a1d3bc8d9f01baead36.zip gcc-b00f4f15c1d592a3d00c6a1d3bc8d9f01baead36.tar.gz gcc-b00f4f15c1d592a3d00c6a1d3bc8d9f01baead36.tar.bz2 | |
re PR c++/61198 (Crash when selecting specializations through aliases.)
PR c++/61198
* pt.c (most_general_template): Don't break for template-alias.
From-SVN: r218955
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 823f086..7fcad87 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-19 Kai Tietz <ktietz@redhat.com> + + PR c++/61198 + * pt.c (most_general_template): Don't break for template-alias. + 2014-12-18 Jason Merrill <jason@redhat.com> PR c++/64105 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2a63a2e..15d304a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -19207,6 +19207,7 @@ most_general_template (tree decl) break; if (CLASS_TYPE_P (TREE_TYPE (decl)) + && !TYPE_DECL_ALIAS_P (TYPE_NAME (TREE_TYPE (decl))) && CLASSTYPE_TEMPLATE_SPECIALIZATION (TREE_TYPE (decl))) break; |