From: Kai Tietz <ktietz@redhat.com>
Date: Fri, 19 Dec 2014 16:44:15 +0000 (+0100)
Subject: re PR c++/61198 (Crash when selecting specializations through aliases.)
X-Git-Tag: releases/gcc-5.1.0~2237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b00f4f15c1d592a3d00c6a1d3bc8d9f01baead36;p=thirdparty%2Fgcc.git

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 823f08642299..7fcad878af77 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 2a63a2e1bca0..15d304af635e 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;