diff options
| author | Jason Merrill <jason@redhat.com> | 2007-09-28 14:07:57 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2007-09-28 14:07:57 -0400 |
| commit | d9d9dbc0d0d3a1f419115367cfe23992a92f822b (patch) | |
| tree | c0601f8dd3b95792f0db5c5bd35d56980a712650 /gcc/cp/class.c | |
| parent | 930a1e6372869fa553130c5e7fa22c27485b7ec5 (diff) | |
| download | gcc-d9d9dbc0d0d3a1f419115367cfe23992a92f822b.zip gcc-d9d9dbc0d0d3a1f419115367cfe23992a92f822b.tar.gz gcc-d9d9dbc0d0d3a1f419115367cfe23992a92f822b.tar.bz2 | |
re PR c++/10179 (alignment attributes are not inherited correctly with empty classes)
PR c++/10179
* class.c (layout_empty_base): Take rli parameter, update
rli->record_align if empty base has user-specified alignment.
(build_base_field): Pass rli to it.
From-SVN: r128871
Diffstat (limited to 'gcc/cp/class.c')
| -rw-r--r-- | gcc/cp/class.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 5c3e054..4419813 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -179,7 +179,7 @@ static void initialize_vtable (tree, tree); static void layout_nonempty_base_or_field (record_layout_info, tree, tree, splay_tree); static tree end_of_class (tree, int); -static bool layout_empty_base (tree, tree, splay_tree); +static bool layout_empty_base (record_layout_info, tree, tree, splay_tree); static void accumulate_vtbl_inits (tree, tree, tree, tree, tree); static tree dfs_accumulate_vtbl_inits (tree, tree, tree, tree, tree); @@ -3517,7 +3517,8 @@ empty_base_at_nonzero_offset_p (tree type, type. Return nonzero iff we added it at the end. */ static bool -layout_empty_base (tree binfo, tree eoc, splay_tree offsets) +layout_empty_base (record_layout_info rli, tree binfo, + tree eoc, splay_tree offsets) { tree alignment; tree basetype = BINFO_TYPE (binfo); @@ -3563,6 +3564,15 @@ layout_empty_base (tree binfo, tree eoc, splay_tree offsets) propagate_binfo_offsets (binfo, alignment); } } + + if (CLASSTYPE_USER_ALIGN (basetype)) + { + rli->record_align = MAX (rli->record_align, CLASSTYPE_ALIGN (basetype)); + if (warn_packed) + rli->unpacked_align = MAX (rli->unpacked_align, CLASSTYPE_ALIGN (basetype)); + TYPE_USER_ALIGN (rli->t) = 1; + } + return atend; } @@ -3626,7 +3636,7 @@ build_base_field (record_layout_info rli, tree binfo, byte-aligned. */ eoc = round_up (rli_size_unit_so_far (rli), CLASSTYPE_ALIGN_UNIT (basetype)); - atend = layout_empty_base (binfo, eoc, offsets); + atend = layout_empty_base (rli, binfo, eoc, offsets); /* A nearly-empty class "has no proper base class that is empty, not morally virtual, and at an offset other than zero." */ if (!BINFO_VIRTUAL_P (binfo) && CLASSTYPE_NEARLY_EMPTY_P (t)) |