From: Jason Merrill <jason@yorick.cygnus.com>
Date: Sun, 2 Nov 1997 23:07:03 +0000 (+0000)
Subject: * class.c (build_vbase_path): Propagate the result type properly.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b9ddcfac31ed5b5b495931e5a8660bc63166dc09;p=gcc.git

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

From-SVN: r16279
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bb27b8c9a20..c1ea91b68d3 100644
--- 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 aac95b815d1..7777b8a2b34 100644
--- 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;