From fade9a8e43b096aa4462ce63a556c03429cb7398 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Sat, 25 Nov 2006 20:42:00 -0800 Subject: [PATCH] re PR fortran/29982 ([4.1 only] ICE in write() with gfortran 4.1.2 (and 4.2 and 4.3...)) 2006-11-25 Andrew Pinski PR fortran/29982 * trans-expr.c (gfc_conv_expr_reference): Strip off NOP_EXPRs. 2006-11-25 Andrew Pinski PR fortran/29982 * gfortran.fortran-torture/compile/parameter_3.f90: New testcase. From-SVN: r119218 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/trans-expr.c | 6 ++++-- gcc/testsuite/ChangeLog | 6 ++++++ .../gfortran.fortran-torture/compile/parameter_3.f90 | 4 ++++ 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.fortran-torture/compile/parameter_3.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index cf7879758c6..a6a2962e365 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2006-11-25 Andrew Pinski + + PR fortran/29982 + * trans-expr.c (gfc_conv_expr_reference): Strip off NOP_EXPRs. + 2006-11-25 Andrew Pinski PR fortran/29951 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 984c6d34c5b..8e1dcc13f3f 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -3133,8 +3133,10 @@ gfc_conv_expr_reference (gfc_se * se, gfc_expr * expr) /* Create a temporary var to hold the value. */ if (TREE_CONSTANT (se->expr)) { - var = build_decl (CONST_DECL, NULL, TREE_TYPE (se->expr)); - DECL_INITIAL (var) = se->expr; + tree tmp = se->expr; + STRIP_TYPE_NOPS (tmp); + var = build_decl (CONST_DECL, NULL, TREE_TYPE (tmp)); + DECL_INITIAL (var) = tmp; TREE_STATIC (var) = 1; pushdecl (var); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ccb37744d5a..71752094394 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2006-11-25 Andrew Pinski + + PR fortran/29982 + * gfortran.fortran-torture/compile/parameter_3.f90: New + testcase. + 2006-11-25 Andrew Pinski PR fortran/29951 diff --git a/gcc/testsuite/gfortran.fortran-torture/compile/parameter_3.f90 b/gcc/testsuite/gfortran.fortran-torture/compile/parameter_3.f90 new file mode 100644 index 00000000000..4f5b0d90b9b --- /dev/null +++ b/gcc/testsuite/gfortran.fortran-torture/compile/parameter_3.f90 @@ -0,0 +1,4 @@ +program tst + write (6,"(a,es15.8)") "2.0**(-0.0) = ",2.0**(-0.0) +end program tst + -- 2.30.2