aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Gregor <doug.gregor@gmail.com>2007-01-05 14:16:48 +0000
committerDoug Gregor <dgregor@gcc.gnu.org>2007-01-05 14:16:48 +0000
commit3d761c462aacbfd10cbfe78356b958fd5459cba6 (patch)
tree574bda8fb9b87aab5e94dafad0b0aaba37eff28d
parenta4f77ff7d35c852d97a5bb6d13013a4182e77082 (diff)
downloadgcc-3d761c462aacbfd10cbfe78356b958fd5459cba6.zip
gcc-3d761c462aacbfd10cbfe78356b958fd5459cba6.tar.gz
gcc-3d761c462aacbfd10cbfe78356b958fd5459cba6.tar.bz2
pt.c (tsubst): Propagate the need for structural equality checks when...
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. From-SVN: r120483
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/pt.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7a37036..79dce74 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 c1fc2ad..787cd60 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);