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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 823f086422996beac727a1d044f5e3ed15101515..7fcad878af77fed2226dc4db8976955c5d9b08b3 100644 (file)
--- 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 2a63a2e1bca05bd38ef9e77e385ef29237262d7b..15d304af635e26462012adfa15644d32945047fe 100644 (file)
--- 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;