From: Daniel Kraft Date: Thu, 11 Sep 2008 07:28:18 +0000 (+0200) Subject: re PR fortran/36214 (Wrong simplification of BOZ constants) X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ace428e3133f0aa7f4cb90180e716114bf73d705;p=platform%2Fupstream%2Fgcc.git re PR fortran/36214 (Wrong simplification of BOZ constants) 2008-09-11 Daniel Kraft PR fortran/36214 * simplify.c (simplify_cmplx): Added linebreak to long line. * target-memory.c (gfc_convert_boz): Fix indentation. (gfc_interpret_float): Set mpfr precision to right value before calling mpfr_init. 2008-09-11 Daniel Kraft PR fortran/36214 * gfortran.dg/boz_9.f90: Corrected test. * gfortran.dg/boz_13.f90: New test. * gfortran.dg/boz_14.f90: New test. From-SVN: r140264 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index d7361e0..954d5cd 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2008-09-11 Daniel Kraft + + PR fortran/36214 + * simplify.c (simplify_cmplx): Added linebreak to long line. + * target-memory.c (gfc_convert_boz): Fix indentation. + (gfc_interpret_float): Set mpfr precision to right value before + calling mpfr_init. + 2008-09-10 H.J. Lu * expr.c (find_array_element): Reformat comment. diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 64d2be1..c0ac026 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -884,7 +884,8 @@ simplify_cmplx (const char *name, gfc_expr *x, gfc_expr *y, int kind) { case BT_INTEGER: if (!y->is_boz) - mpfr_set_z (result->value.complex.i, y->value.integer, GFC_RND_MODE); + mpfr_set_z (result->value.complex.i, y->value.integer, + GFC_RND_MODE); break; case BT_REAL: diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c index b1029df..72bd6ef 100644 --- a/gcc/fortran/target-memory.c +++ b/gcc/fortran/target-memory.c @@ -349,8 +349,9 @@ gfc_interpret_integer (int kind, unsigned char *buffer, size_t buffer_size, int gfc_interpret_float (int kind, unsigned char *buffer, size_t buffer_size, - mpfr_t real) + mpfr_t real) { + gfc_set_model_kind (kind); mpfr_init (real); gfc_conv_tree_to_mpfr (real, native_interpret_expr (gfc_get_real_type (kind), @@ -699,10 +700,8 @@ gfc_convert_boz (gfc_expr *expr, gfc_typespec *ts) } for (index = 0; gfc_integer_kinds[index].kind != 0; ++index) - { - if ((unsigned) gfc_integer_kinds[index].bit_size >= ts_bit_size) - break; - } + if ((unsigned) gfc_integer_kinds[index].bit_size >= ts_bit_size) + break; expr->ts.kind = gfc_integer_kinds[index].kind; buffer_size = MAX (buffer_size, size_integer (expr->ts.kind)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 88463e9..b42b5df 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2008-09-11 Daniel Kraft + + PR fortran/36214 + * gfortran.dg/boz_9.f90: Corrected test. + * gfortran.dg/boz_13.f90: New test. + * gfortran.dg/boz_14.f90: New test. + 2008-09-10 Jakub Jelinek PR target/36904 diff --git a/gcc/testsuite/gfortran.dg/boz_13.f90 b/gcc/testsuite/gfortran.dg/boz_13.f90 new file mode 100644 index 0000000..a522f82 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/boz_13.f90 @@ -0,0 +1,13 @@ +! { dg-do run } + +! PR fortran/36214 +! For BOZ-initialization of floats, the precision used to be wrong sometimes. + +implicit none + real, parameter :: r = 0.0 + real(kind=8), parameter :: rd = real (z'00000000& + &402953FD', 8) + + if (real (z'00000000& + &402953FD', 8) /= rd) call abort +end diff --git a/gcc/testsuite/gfortran.dg/boz_14.f90 b/gcc/testsuite/gfortran.dg/boz_14.f90 new file mode 100644 index 0000000..a6690ce --- /dev/null +++ b/gcc/testsuite/gfortran.dg/boz_14.f90 @@ -0,0 +1,18 @@ +! { dg-do run } + +! PR fortran/36214 +! For BOZ-initialization of floats, the precision used to be wrong sometimes. + + implicit none + real(4) r + real(8) rd + complex(8) z + rd = & + real (b'00000000000000000000000000000000& + &01000000001010010101001111111101',8) + z = & + cmplx(b'00000000000000000000000000000000& + &01000000001010010101001111111101',0,8) + r = 0. + if (z /= rd) call abort + end diff --git a/gcc/testsuite/gfortran.dg/boz_9.f90 b/gcc/testsuite/gfortran.dg/boz_9.f90 index e1b0592..1488c6d 100644 --- a/gcc/testsuite/gfortran.dg/boz_9.f90 +++ b/gcc/testsuite/gfortran.dg/boz_9.f90 @@ -22,13 +22,13 @@ complex :: z2 = cmplx(5.0, o'01245') if (r2c /= 13107.0) call abort() if (rc /= 1.83668190E-41) call abort() -if (dc /= 0.30102999566398120) call abort() +if (dc /= 0.30102999566398120d0) call abort() if (real(z1c) /= 2.94272678E-44 .or. aimag(z1c) /= -4.0) call abort() if (real(z2c) /= 5.0 .or. aimag(z2c) /= 9.48679060E-43) call abort() if (r2 /= 13107.0) call abort() if (r /= 1.83668190E-41) call abort() -if (d /= 0.30102999566398120) call abort() +if (d /= 0.30102999566398120d0) call abort() if (real(z1) /= 2.94272678E-44 .or. aimag(z1) /= -4.0) call abort() if (real(z2) /= 5.0 .or. aimag(z2) /= 9.48679060E-43) call abort() @@ -40,7 +40,7 @@ z2 = cmplx(5.0, o'01245') if (r2 /= 13107.0) call abort() if (r /= 1.83668190E-41) call abort() -if (d /= 0.30102999566398120) call abort() +if (d /= 0.30102999566398120d0) call abort() if (real(z1) /= 2.94272678E-44 .or. aimag(z1) /= -4.0) call abort() if (real(z2) /= 5.0 .or. aimag(z2) /= 9.48679060E-43) call abort()