From: dgregor <dgregor@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 5 Jan 2007 14:16:48 +0000 (+0000)
Subject: 2007-01-04  Douglas Gregor  <doug.gregor@gmail.com>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11b0d70e4f4dbc5a4cd87fd68ad258ae13916753;p=thirdparty%2Fgcc.git

2007-01-04  Douglas Gregor  <doug.gregor@gmail.com>

	* pt.c (tsubst): Propagate the need for structural equality checks
	when reducing the level of template parameters.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120483 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7a370367c426..79dce7482ac3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-05  Douglas Gregor  <doug.gregor@gmail.com>
+
+	* pt.c (tsubst): Propagate the need for structural equality checks
+	when reducing the level of template parameters.
+
 2007-01-03  Kazu Hirata  <kazu@codesourcery.com>
 
 	* pt.c: Fix a comment typo.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index c1fc2ad4f46b..787cd60b060e 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -7530,6 +7530,8 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
 		     require structural equality checking to compare
 		     TEMPLATE_TEMPLATE_PARMs. */
 		  SET_TYPE_STRUCTURAL_EQUALITY (r);
+		else if (TYPE_STRUCTURAL_EQUALITY_P (t))
+		  SET_TYPE_STRUCTURAL_EQUALITY (r);
 		else
 		  TYPE_CANONICAL (r) = canonical_type_parameter (r);