diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/call.c | 22 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/expr/bitfield9.C | 25 |
4 files changed, 58 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7b1dc92..3c7b8c6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2007-07-27 Mark Mitchell <mark@codesourcery.com> + + PR c++/32346 + * call.c (convert_for_arg_passing): Only widen bitfields to their + declared types if necessary. + 2007-07-25 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * parser.c (cp_parser_string_literal, cp_parser_sizeof_operand): diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 82f8666..1f220f0 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4752,7 +4752,27 @@ type_passed_as (tree type) tree convert_for_arg_passing (tree type, tree val) { - val = convert_bitfield_to_declared_type (val); + tree bitfield_type; + + /* If VAL is a bitfield, then -- since it has already been converted + to TYPE -- it cannot have a precision greater than TYPE. + + If it has a smaller precision, we must widen it here. For + example, passing "int f:3;" to a function expecting an "int" will + not result in any conversion before this point. + + If the precision is the same we must not risk widening. For + example, the COMPONENT_REF for a 32-bit "long long" bitfield will + often have type "int", even though the C++ type for the field is + "long long". If the value is being passed to a function + expecting an "int", then no conversions will be required. But, + if we call convert_bitfield_to_declared_type, the bitfield will + be converted to "long long". */ + bitfield_type = is_bitfield_expr_with_lowered_type (val); + if (bitfield_type + && TYPE_PRECISION (TREE_TYPE (val)) < TYPE_PRECISION (type)) + val = convert_to_integer (TYPE_MAIN_VARIANT (bitfield_type), val); + if (val == error_mark_node) ; /* Pass classes with copy ctors by invisible reference. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cc8cfc2..7649406 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-07-27 Mark Mitchell <mark@codesourcery.com> + + PR c++/32346 + * g++.dg/expr/bitfield9.C: New test. + 2007-07-26 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/32899 @@ -22,7 +27,7 @@ * gcc.target/mips/ins-1.c: New test. -2007-07-26 Nathan Froyd <froydnj@codesourcery.com> +'2007-07-26 Nathan Froyd <froydnj@codesourcery.com> PR/19232 * gcc.dg/assign-warn-3.c (f0): Declare as inline. diff --git a/gcc/testsuite/g++.dg/expr/bitfield9.C b/gcc/testsuite/g++.dg/expr/bitfield9.C new file mode 100644 index 0000000..047b1bf --- /dev/null +++ b/gcc/testsuite/g++.dg/expr/bitfield9.C @@ -0,0 +1,25 @@ +// PR c++/32346 +// { dg-do run } + +extern "C" void abort(); + +struct S { + long long i : 32; +}; + +void f(int i, int j) { + if (i != 0xabcdef01) + abort(); + if (j != 0) + abort(); +} + +void g(S s) { + f(s.i, 0); +} + +int main() { + S s; + s.i = 0xabcdef01; + g(s); +} |