From 7f0d6da9e8ef47bc262e242c846d39cba4eca474 Mon Sep 17 00:00:00 2001 From: Erik Edelmann Date: Mon, 24 Jul 2006 20:15:59 +0000 Subject: [PATCH] re PR fortran/28416 (ICE on allocatable codes) fortran/ 2006-07-24 Erik Edelmann PR fortran/28416 * trans-array.c (gfc_conv_array_parameter): Give special treatment for ALLOCATABLEs if they are themselves dummy variables. testsuite/ 2006-07-24 Erik Edelmann PR fortran/28416 * gfortran.dg/allocatable_dummy_3.f90: New. From-SVN: r115721 --- gcc/fortran/ChangeLog | 6 +++ gcc/fortran/trans-array.c | 8 +++- gcc/testsuite/ChangeLog | 5 +++ .../gfortran.dg/allocatable_dummy_3.f90 | 39 +++++++++++++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/allocatable_dummy_3.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index df09fcb3052..7940ea5dbca 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2006-07-24 Erik Edelmann + + PR fortran/28416 + * trans-array.c (gfc_conv_array_parameter): Give special treatment for + ALLOCATABLEs if they are themselves dummy variables. + 2006-07-23 Jerry DeLisle PR fortran/25289 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 274ccdbe533..a976cb90931 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -4524,7 +4524,13 @@ gfc_conv_array_parameter (gfc_se * se, gfc_expr * expr, gfc_ss * ss, int g77) } if (sym->attr.allocatable) { - se->expr = gfc_conv_array_data (tmp); + if (sym->attr.dummy) + { + gfc_conv_expr_descriptor (se, expr, ss); + se->expr = gfc_conv_array_data (se->expr); + } + else + se->expr = gfc_conv_array_data (tmp); return; } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 89ed839a13d..815c7933bfe 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-07-24 Erik Edelmann + + PR fortran/28416 + * gfortran.dg/allocatable_dummy_3.f90: New. + 2006-07-24 Steven G. Kargl PR fortran/28439 diff --git a/gcc/testsuite/gfortran.dg/allocatable_dummy_3.f90 b/gcc/testsuite/gfortran.dg/allocatable_dummy_3.f90 new file mode 100644 index 00000000000..d2b4e1eba02 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/allocatable_dummy_3.f90 @@ -0,0 +1,39 @@ +! { dg-do run } +! PR 28416: Check that allocatable dummies can be passed onwards as non-assumed +! shape arg. +program main + + implicit none + integer, allocatable :: a(:) + + interface + subroutine foo(v_out) + integer, allocatable :: v_out(:) + end subroutine foo + end interface + + call foo(a) + if (any(a /= [ 1, 2, 3 ])) call abort() + +end program + + +subroutine foo(v_out) + implicit none + integer, allocatable :: v_out(:) + + allocate(v_out(3)) + call bar(v_out, size(v_out)) +end subroutine foo + + +subroutine bar(v, N) + implicit none + integer :: N + integer :: v(N) + integer :: i + + do i = 1, N + v(i) = i + end do +end subroutine bar -- 2.30.2