From efc694a70a411f4399c71c715afaa22b10edac75 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Sat, 23 Jul 2011 00:39:10 +0200 Subject: [PATCH] resolve.c (resolve_symbol): Fix coarray var decl check. 2011-07-23 Tobias Burnus * resolve.c (resolve_symbol): Fix coarray var decl check. 2011-07-23 Tobias Burnus * gfortran.dg/coarray_25.f90: New. From-SVN: r176660 --- gcc/fortran/ChangeLog | 4 ++++ gcc/fortran/resolve.c | 8 +++----- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gfortran.dg/coarray_25.f90 | 18 ++++++++++++++++++ gcc/testsuite/gfortran.dg/coarray_4.f90 | 2 +- 5 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/coarray_25.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index dd4cd8dd15a..533c28c5e06 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2011-07-23 Tobias Burnus + + * resolve.c (resolve_symbol): Fix coarray var decl check. + 2011-07-21 Daniel Carrera * trans.c (gfc_allocate_with_status): Split into two functions diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 71e0ba062f5..e9e7bf00fab 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -12435,16 +12435,14 @@ resolve_symbol (gfc_symbol *sym) sym->name, &sym->declared_at); /* F2008, C526. The function-result case was handled above. */ - if (((sym->ts.type == BT_DERIVED && sym->ts.u.derived->attr.coarray_comp) - || sym->attr.codimension) + if (sym->attr.codimension && !(sym->attr.allocatable || sym->attr.dummy || sym->attr.save || sym->ns->save_all || sym->ns->proc_name->attr.flavor == FL_MODULE || sym->ns->proc_name->attr.is_main_program || sym->attr.function || sym->attr.result || sym->attr.use_assoc)) - gfc_error ("Variable '%s' at %L is a coarray or has a coarray " - "component and is not ALLOCATABLE, SAVE nor a " - "dummy argument", sym->name, &sym->declared_at); + gfc_error ("Variable '%s' at %L is a coarray and is not ALLOCATABLE, SAVE " + "nor a dummy argument", sym->name, &sym->declared_at); /* F2008, C528. */ /* FIXME: sym->as check due to PR 43412. */ else if (sym->attr.codimension && !sym->attr.allocatable && sym->as && sym->as->cotype == AS_DEFERRED) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ec8a8e0fbae..8eb2828f92c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-07-23 Tobias Burnus + + * gfortran.dg/coarray_25.f90: New. + 2011-07-22 Ville Voutilainen * override1.C: This test should use c++0x mode. diff --git a/gcc/testsuite/gfortran.dg/coarray_25.f90 b/gcc/testsuite/gfortran.dg/coarray_25.f90 new file mode 100644 index 00000000000..a78a1962b3b --- /dev/null +++ b/gcc/testsuite/gfortran.dg/coarray_25.f90 @@ -0,0 +1,18 @@ +! { dg-do compile } +! { dg-options "-fcoarray=single" } +! +! Used to be rejected with: +! Error: Variable 'x' at (1) is a coarray or has a coarray +! component and is not ALLOCATABLE, SAVE nor a dummy argument +! +! Is valid as "a" is allocatable, cf. C526 +! and http://j3-fortran.org/pipermail/j3/2011-June/004403.html +! + + subroutine test2() + type t + integer, allocatable :: a(:)[:] + end type t + type(t) :: x + allocate(x%a(1)[*]) + end subroutine test2 diff --git a/gcc/testsuite/gfortran.dg/coarray_4.f90 b/gcc/testsuite/gfortran.dg/coarray_4.f90 index be2bc4edb5c..cdc4ef88e73 100644 --- a/gcc/testsuite/gfortran.dg/coarray_4.f90 +++ b/gcc/testsuite/gfortran.dg/coarray_4.f90 @@ -31,7 +31,7 @@ subroutine valid2() integer, allocatable :: b[:] end type tt type(tt), save :: foo - type(tt) :: bar ! { dg-error "is a coarray or has a coarray component" } + type(tt) :: bar end subroutine valid2 subroutine invalid(n) -- 2.30.2