| Message ID | trinity-2e95f245-4651-47b4-87f5-6c96204fe540-1600202141362@3c-app-gmx-bap13 |
|---|---|
| State | New |
| Headers | show |
| Series | PR fortran/97036 - [F2018] Allow ELEMENTAL RECURSIVE procedure prefix | expand |
ok, thanks . On 9/15/20 1:35 PM, Harald Anlauf wrote: > As stated in the PR, the Fortran 2018 standard removed the restriction > prohibiting ELEMENTAL RECURSIVE procedures. Adjust the relevant check. > > Regtested on x86_64-pc-linux-gnu. > > OK for master? > > Thanks, > Harald > > > PR fortran/97036 - [F2018] Allow ELEMENTAL RECURSIVE procedure prefix > > gcc/fortran/ChangeLog: > > * symbol.c (gfc_check_conflict): Allow ELEMENTAL RECURSIVE > procedure prefix for -std=f2018. > > gcc/testsuite/ChangeLog: > > * gfortran.dg/pr97036.f90: New test. >
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index abd3b5ccfd0..df1e8965daa 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -569,7 +569,7 @@ gfc_check_conflict (symbol_attribute *attr, const char *name, locus *where) conf_std (allocatable, dummy, GFC_STD_F2003); conf_std (allocatable, function, GFC_STD_F2003); conf_std (allocatable, result, GFC_STD_F2003); - conf (elemental, recursive); + conf_std (elemental, recursive, GFC_STD_F2018); conf (in_common, dummy); conf (in_common, allocatable); diff --git a/gcc/testsuite/gfortran.dg/pr97036.f90 b/gcc/testsuite/gfortran.dg/pr97036.f90 new file mode 100644 index 00000000000..cfe51debce1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr97036.f90 @@ -0,0 +1,27 @@ +! { dg-do compile } +! { dg-options "-std=f2018" } +! PR fortran/97036 - [F2018] Allow ELEMENTAL RECURSIVE procedure prefix + +module m97036 + implicit none +contains + impure elemental recursive subroutine foo (n) + integer, intent(in) :: n + integer :: k(n), f(n), i + k = [ (i-1, i=1,n) ] + f = fac (k) + print *, f + end subroutine foo + elemental recursive subroutine bla () + end subroutine bla + elemental recursive function fac (k) result (f) + integer, intent(in) :: k + integer :: f + f = 1 + if (k > 1) f = k*fac (k-1) + end function fac +end module + use m97036 + implicit none + call foo ([4,5]) +end