diff options
| author | Andre Vehreschild <vehre@gcc.gnu.org> | 2016-04-04 12:32:32 +0200 |
|---|---|---|
| committer | Andre Vehreschild <vehre@gcc.gnu.org> | 2016-04-04 12:32:32 +0200 |
| commit | 7a85da896a9ceac338801d6ad0997ef7834660cb (patch) | |
| tree | afc2fedbeca840b624e3578d2279211a44b77cb5 | |
| parent | de517e644a374f7df40bf0b43254684dab717ac0 (diff) | |
| download | gcc-7a85da896a9ceac338801d6ad0997ef7834660cb.zip gcc-7a85da896a9ceac338801d6ad0997ef7834660cb.tar.gz gcc-7a85da896a9ceac338801d6ad0997ef7834660cb.tar.bz2 | |
re PR fortran/67538 (ICE with invalid source allocation)
gcc/fortran/ChangeLog:
2016-04-04 Andre Vehreschild <vehre@gcc.gnu.org>
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 <vehre@gcc.gnu.org>
PR fortran/67538
* gfortran.dg/allocate_with_source_19.f08: New test.
From-SVN: r234714
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/allocate_with_source_19.f08 | 22 |
4 files changed, 43 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 88ac1cc..4ad92c0 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,12 @@ 2016-04-04 Andre Vehreschild <vehre@gcc.gnu.org> + 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 <vehre@gcc.gnu.org> + PR fortran/65795 * trans-array.c (gfc_array_allocate): When the array is a coarray, do not nullyfing its allocatable components in array_allocate, because diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 55ab2ec..f5cd588 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 47656a9..2de8ea5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2016-04-04 Andre Vehreschild <vehre@gcc.gnu.org> + PR fortran/67538 + * gfortran.dg/allocate_with_source_19.f08: New test. + +2016-04-04 Andre Vehreschild <vehre@gcc.gnu.org> + PR fortran/65795 * gfortran.dg/coarray_allocate_6.f08: New test. 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 0000000..ff84510 --- /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 + |