Hi Jerry,
thanks for the review. Committed as r234714.
Regards,
Andre
On Sun, 3 Apr 2016 12:23:08 -0700
Jerry DeLisle <jvdeli...@charter.net> wrote:
> On 04/03/2016 09:13 AM, Andre Vehreschild wrote:
> > Hi all,
> >
> > the attached patch checks that for F2008-style allocate(arr1, source=s)
> > the expression in s is array valued, when arr1 has no array spec and
> > emits an error message saying:
> >
> > Array specification or array-valued SOURCE= expression required in ALLOCATE
> > statement at (1)
> >
> > This fixes the ICE.
> >
> > Bootstrapped and regtests ok on x86_64-linux-gnu/F23. Ok for trunk?
> >
> > Regards,
> > Andre
> >
>
> Yes, OK, thanks for patches.
>
> Jerry
--
Andre Vehreschild * Email: vehre ad gmx dot de
Index: gcc/fortran/ChangeLog
===================================================================
--- gcc/fortran/ChangeLog (Revision 234712)
+++ gcc/fortran/ChangeLog (Arbeitskopie)
@@ -1,5 +1,12 @@
2016-04-04 Andre Vehreschild <ve...@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 <ve...@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
Index: gcc/fortran/resolve.c
===================================================================
--- gcc/fortran/resolve.c (Revision 234712)
+++ gcc/fortran/resolve.c (Arbeitskopie)
@@ -7217,7 +7217,15 @@
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
{
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog (Revision 234712)
+++ gcc/testsuite/ChangeLog (Arbeitskopie)
@@ -1,5 +1,10 @@
2016-04-04 Andre Vehreschild <ve...@gcc.gnu.org>
+ PR fortran/67538
+ * gfortran.dg/allocate_with_source_19.f08: New test.
+
+2016-04-04 Andre Vehreschild <ve...@gcc.gnu.org>
+
PR fortran/65795
* gfortran.dg/coarray_allocate_6.f08: New test.
Index: gcc/testsuite/gfortran.dg/allocate_with_source_19.f08
===================================================================
--- gcc/testsuite/gfortran.dg/allocate_with_source_19.f08 (nicht existent)
+++ gcc/testsuite/gfortran.dg/allocate_with_source_19.f08 (Arbeitskopie)
@@ -0,0 +1,22 @@
+! { dg-do compile }
+! { dg-options -std=f2008 }
+
+! Contributed by mreste...@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
+
