From 7a85da896a9ceac338801d6ad0997ef7834660cb Mon Sep 17 00:00:00 2001 From: Andre Vehreschild Date: Mon, 4 Apr 2016 12:32:32 +0200 Subject: [PATCH] re PR fortran/67538 (ICE with invalid source allocation) gcc/fortran/ChangeLog: 2016-04-04 Andre Vehreschild PR fortran/67538 * resolve.c (resolve_allocate_expr): Emit error message when no array spec and no array valued source= expression is given in an F2008 allocate() for an array to allocate. gcc/testsuite/ChangeLog: 2016-04-04 Andre Vehreschild PR fortran/67538 * gfortran.dg/allocate_with_source_19.f08: New test. From-SVN: r234714 --- gcc/fortran/ChangeLog | 7 ++++++ gcc/fortran/resolve.c | 10 ++++++++- gcc/testsuite/ChangeLog | 5 +++++ .../gfortran.dg/allocate_with_source_19.f08 | 22 +++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/allocate_with_source_19.f08 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 88ac1cc352e..4ad92c0fb2d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2016-04-04 Andre Vehreschild + + PR fortran/67538 + * resolve.c (resolve_allocate_expr): Emit error message when no + array spec and no array valued source= expression is given in an + F2008 allocate() for an array to allocate. + 2016-04-04 Andre Vehreschild PR fortran/65795 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 55ab2ecfceb..f5cd588308a 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -7217,7 +7217,15 @@ resolve_allocate_expr (gfc_expr *e, gfc_code *code, bool *array_alloc_wo_spec) if (!gfc_notify_std (GFC_STD_F2008, "Array specification required " "in ALLOCATE statement at %L", &e->where)) goto failure; - *array_alloc_wo_spec = true; + if (code->expr3->rank != 0) + *array_alloc_wo_spec = true; + else + { + gfc_error ("Array specification or array-valued SOURCE= " + "expression required in ALLOCATE statement at %L", + &e->where); + goto failure; + } } else { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 47656a92652..2de8ea55fd0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-04-04 Andre Vehreschild + + PR fortran/67538 + * gfortran.dg/allocate_with_source_19.f08: New test. + 2016-04-04 Andre Vehreschild PR fortran/65795 diff --git a/gcc/testsuite/gfortran.dg/allocate_with_source_19.f08 b/gcc/testsuite/gfortran.dg/allocate_with_source_19.f08 new file mode 100644 index 00000000000..ff8451093a8 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/allocate_with_source_19.f08 @@ -0,0 +1,22 @@ +! { dg-do compile } +! { dg-options -std=f2008 } + +! Contributed by mrestelli@gmail.com +! Check that instead of an ICE the error message is emitted. + +module m + implicit none +contains + + subroutine s() + real, allocatable :: x(:) + real :: y + + y = 5.0 + ! x either needs an array spec, or y needs to be an array. + allocate( x , source=y ) ! { dg-error "Array specification or array-valued SOURCE= expression required in ALLOCATE statement" } + + end subroutine s + +end module m + -- 2.30.2