OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/9704 (miscompilation of classes with bit fields)

Browse Source 
PR c++/9704
	* class.c (layout_class_type): In the 3.2 ABI, take into account
	trailing bit fields when computing CLASSTYPE_SIZE_UNIT.

	PR c++/9704
	* g++.dg/init/copy5.C: New test.

From-SVN: r63055
This commit is contained in:
Mark Mitchell 2003-02-18 19:17:29 +00:00 committed by Mark Mitchell
parent 2e120205b3
commit 6b99d1c036
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2003-02-18 Mark Mitchell <mark@codesourcery.com>
PR c++/9704
* class.c (layout_class_type): In the 3.2 ABI, take into account
trailing bit fields when computing CLASSTYPE_SIZE_UNIT.
2003-02-18 Matt Austern <austern@apple.com>
* cp/cp-lang.c: Change lang hooks so that final_write_globals does

20
gcc/cp/class.c
View File

@ -5194,16 +5194,28 @@ layout_class_type (tree t, tree *virtuals_p)
}
else
{
tree eoc;
/* If the ABI version is not at least two, and the last
field was a bit-field, RLI may not be on a byte
boundary. In particular, rli_size_unit_so_far might
indicate the last complete byte, while rli_size_so_far
indicates the total number of bits used. Therefore,
rli_size_so_far, rather than rli_size_unit_so_far, is
used to compute TYPE_SIZE_UNIT. */
eoc = end_of_class (t, /*include_virtuals_p=*/0);
TYPE_SIZE_UNIT (base_t)
= size_binop (MAX_EXPR,
rli_size_unit_so_far (rli),
end_of_class (t, /*include_virtuals_p=*/0));
convert (sizetype,
size_binop (CEIL_DIV_EXPR,
rli_size_so_far (rli),
bitsize_int (BITS_PER_UNIT))),
eoc);
TYPE_SIZE (base_t)
= size_binop (MAX_EXPR,
rli_size_so_far (rli),
size_binop (MULT_EXPR,
convert (bitsizetype,
TYPE_SIZE_UNIT (base_t)),
convert (bitsizetype, eoc),
bitsize_int (BITS_PER_UNIT)));
}
TYPE_ALIGN (base_t) = rli->record_align;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2003-02-18 Mark Mitchell <mark@codesourcery.com>
PR c++/9704
* g++.dg/init/copy5.C: New test.
2003-02-18 Geoffrey Keating <geoffk@apple.com>
* gcc.dg/pch/pch.exp: Delete $bname.h before copying into it.