From b9ddcfac31ed5b5b495931e5a8660bc63166dc09 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sun, 2 Nov 1997 23:07:03 +0000 Subject: [PATCH] * class.c (build_vbase_path): Propagate the result type properly. From-SVN: r16279 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/class.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * class.c (build_vbase_path): Propagate the result type properly. + 1997-11-01 Brendan Kehoe * 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; -- 2.30.2