diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1997-11-02 23:07:03 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1997-11-02 18:07:03 -0500 |
| commit | b9ddcfac31ed5b5b495931e5a8660bc63166dc09 (patch) | |
| tree | 15425062f9771ed1f30eaf477dd16f41d5fc1539 /gcc | |
| parent | e9a25f70a0a7b82881b56cb3dfa7422b2968682a (diff) | |
| download | gcc-b9ddcfac31ed5b5b495931e5a8660bc63166dc09.zip gcc-b9ddcfac31ed5b5b495931e5a8660bc63166dc09.tar.gz gcc-b9ddcfac31ed5b5b495931e5a8660bc63166dc09.tar.bz2 | |
* class.c (build_vbase_path): Propagate the result type properly.
From-SVN: r16279
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/class.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bb27b8c..c1ea91b 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 aac95b8..7777b8a 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; |