diff options
| author | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 1995-11-21 01:15:30 +0000 |
|---|---|---|
| committer | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 1995-11-21 01:15:30 +0000 |
| commit | bfba89b845514c509ab38e9debfc30f4553eba5d (patch) | |
| tree | 5677a2bb60bdaf4911f475ba2d18a35872be787c /gcc/cp | |
| parent | e494fe4f058b8777e574c081057fc1275e05758f (diff) | |
| download | gcc-bfba89b845514c509ab38e9debfc30f4553eba5d.tar.gz | |
Bring over:
* init.c (expand_aggr_init): Handle cv qualifiers on the object's
type.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@10581 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/init.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c3fe8be06c0..d2ef74f206f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -6,6 +6,11 @@ Mon Nov 20 14:05:00 1995 Mike Stump <mrs@cygnus.com> * g++.c (pfatal_with_name): Add missing third argument to concat. +Thu Oct 26 13:59:54 1995 Mike Stump <mrs@cygnus.com> + + * init.c (expand_aggr_init): Handle cv qualifiers on the object's + type. + Sun Nov 12 18:09:35 1995 Mike Stump <mrs@cygnus.com> * Version 2.7.1 released. diff --git a/gcc/cp/init.c b/gcc/cp/init.c index ccce6b787a0..9752a9bcd1d 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1176,8 +1176,11 @@ expand_aggr_init (exp, init, alias_this, flags) && TREE_TYPE (init) == type) init = CONSTRUCTOR_ELTS (init); #endif + + TREE_TYPE (exp) = TYPE_MAIN_VARIANT (type); expand_aggr_init_1 (TYPE_BINFO (type), exp, exp, init, alias_this, LOOKUP_NORMAL|flags); + TREE_TYPE (exp) = type; TREE_READONLY (exp) = was_const; TREE_THIS_VOLATILE (exp) = was_volatile; } |