From 887ee29f8e30cfa163eb584b0d6d40689679b639 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Wed, 1 Feb 2012 20:01:49 +0100 Subject: [PATCH] 2012-02-01 Tobias Burnus PR fortran/52059 * trans-expr.c (gfc_conv_procedure_call): Add array ref only to variables. 2012-02-01 Tobias Burnus PR fortran/52059 * gfortran.dg/elemental_function_1.f90: New. From-SVN: r183807 --- gcc/fortran/ChangeLog | 6 +++++ gcc/fortran/trans-expr.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ .../gfortran.dg/elemental_function_1.f90 | 22 +++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/elemental_function_1.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fbbfccf813c..2a7cc2824d3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2012-02-01 Tobias Burnus + + PR fortran/52059 + * trans-expr.c (gfc_conv_procedure_call): Add array ref + only to variables. + 2012-01-31 Tobias Burnus PR fortran/52024 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 657b4f4fd5a..4574c8ea865 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -3526,7 +3526,7 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym, gfc_init_se (&parmse, se); parm_kind = ELEMENTAL; - if (se->ss->dimen > 0 + if (se->ss->dimen > 0 && e->expr_type == EXPR_VARIABLE && se->ss->info->data.array.ref == NULL) { gfc_conv_tmp_array_ref (&parmse); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8179fc7924a..95b1ece9534 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-02-01 Tobias Burnus + + PR fortran/52059 + * gfortran.dg/elemental_function_1.f90: New. + 2012-02-01 Georg-Johann Lay PR rtl-optimization/51374 diff --git a/gcc/testsuite/gfortran.dg/elemental_function_1.f90 b/gcc/testsuite/gfortran.dg/elemental_function_1.f90 new file mode 100644 index 00000000000..8f556f4b98e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/elemental_function_1.f90 @@ -0,0 +1,22 @@ +! { dg-do compile } +! +! PR fortran/52059 +! +! + +subroutine baz + real(kind=8) :: a(99), b + interface bar + function bar (x, y) + integer, intent(in) :: x, y + real(kind=8), dimension((y-x)) :: bar + end function bar + end interface + b = 1.0_8 + a = foo (bar(0,35) / dble(34), b) +contains + elemental real(kind=8) function foo(x, y) + real(kind=8), intent(in) :: x, y + foo = 1 + end function foo +end subroutine baz -- 2.30.2