* class.c (build_vbase_path): Propagate the result type properly.

From-SVN: r16279

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bb27b8c9a20da525bcce8a4a0e85009c9dfb811d..c1ea91b68d3419063b7fc2a2bc8b10e40f6e1dae 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Sun Nov  2 15:04:12 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * class.c (build_vbase_path): Propagate the result type properly.
+
 1997-11-01  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
        * lex.c (FILE_NAME_NONDIRECTORY): Delete macro.

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index aac95b815d1aad5e5ecc76d46a39961d4e40cf19..7777b8a2b3440239a5ca2159575433cea05ededd 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -341,7 +341,8 @@ build_vbase_path (code, type, expr, path, alias_this)
   if (null_expr)
     {
       TREE_OPERAND (expr, 2) = nonnull_expr;
-      TREE_TYPE (TREE_OPERAND (expr, 1)) = TREE_TYPE (nonnull_expr);
+      TREE_TYPE (expr) = TREE_TYPE (TREE_OPERAND (expr, 1))
+       = TREE_TYPE (nonnull_expr);
     }
   else
     expr = nonnull_expr;