* pt.c (tsubst): Always copy BINFO_BASETYPES.

From-SVN: r20158

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 16e5074143a8922af3427fed3e177be46a4085d0..c7e34a1bc7eb528b1c606aec3b7c7b8e9864bdf3 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1998-05-31  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * pt.c (tsubst): Always copy BINFO_BASETYPES.
+
 1998-05-29  scott snyder  <snyder@d0sgif.fnal.gov>
 
        * tree.c (layout_basetypes): If we change TYPE_SIZE, change

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index a214906eaaa16baaca1bdb36678a79b1dd2c7eab..3927b5181befbb7653344420c7d82787e536cd9a 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4830,16 +4830,14 @@ tsubst (t, args, in_decl)
     case TREE_VEC:
       if (type != NULL_TREE)
        {
-         /* A binfo node.  */
+         /* A binfo node.  We always need to make a copy, of the node
+            itself and of its BINFO_BASETYPES.  */
 
          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;
-
          TREE_TYPE (t) = complete_type (type);
          if (IS_AGGR_TYPE (type))
            {