pt.c (tsubst): Make sure that BINFO_TYPE of new binfos is the canonical type.

	* pt.c (tsubst): Make sure that BINFO_TYPE of new binfos is the
	canonical type.

From-SVN: r19815

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0d8f22e2d4aa3e6e397ddb8d3fbe8cb75c55794a..69e6fc68b31fbf35a876c762c105c82c7698d5c3 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 Sun May 17 12:32:08 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
+       * pt.c (tsubst): Make sure that BINFO_TYPE of new binfos is the
+       canonical type.
+
        * call.c (build_over_call): Don't use IS_SIGNATURE on a namespace.
 
 Fri May 15 20:28:00 1998  Jason Merrill  <jason@yorick.cygnus.com>

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index e9938770d6eb1ff63e1f3b1bafcd019afcae9cce..d1793279b8d1c3180cd885219d91acad3bc50bce 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4741,6 +4741,9 @@ tsubst (t, args, in_decl)
 
          t = copy_node (t);
 
+         /* Make sure type isn't a typedef copy.  */
+         type = BINFO_TYPE (TYPE_BINFO (type));
+
          if (type == TREE_TYPE (t))
            return t;