diff options
| author | Tobias Burnus <burnus@net-b.de> | 2010-10-21 08:15:30 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2010-10-21 08:15:30 +0200 |
| commit | 9b565d654630853788cce2ea28c6586593bc931b (patch) | |
| tree | 7f346e070e3b514431354b5897d5ea38d8db089d /gcc | |
| parent | 0fd4b31d684af56704c69cdbc8a0c891403ac672 (diff) | |
| download | gcc-9b565d654630853788cce2ea28c6586593bc931b.zip gcc-9b565d654630853788cce2ea28c6586593bc931b.tar.gz gcc-9b565d654630853788cce2ea28c6586593bc931b.tar.bz2 | |
re PR fortran/46100 ([Fortran 2008] Non-variable pointer expression as actual argument to INTENT(OUT) non-pointer dummy)
2010-10-21 Tobias Burnus <burnus@net-b.de>
PR fortran/46100
* expr.c (gfc_check_vardef_context): Treat pointer functions
as variables.
2010-10-21 Tobias Burnus <burnus@net-b.de>
PR fortran/46100
* gfortran.dg/ptr-func-1.f90: New.
* gfortran.dg/ptr-func-2.f90: New.
From-SVN: r165749
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 13 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/ptr-func-1.f90 | 24 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/ptr-func-2.f90 | 24 |
5 files changed, 72 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1e10747..37f4b16 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2010-10-21 Tobias Burnus <burnus@net-b.de> + + PR fortran/46100 + * expr.c (gfc_check_vardef_context): Treat pointer functions + as variables. + 2010-10-20 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR fortran/46079 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 5711634..ef516a4 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -4316,7 +4316,18 @@ gfc_check_vardef_context (gfc_expr* e, bool pointer, const char* context) symbol_attribute attr; gfc_ref* ref; - if (e->expr_type != EXPR_VARIABLE) + if (!pointer && e->expr_type == EXPR_FUNCTION + && e->symtree->n.sym->result->attr.pointer) + { + if (!(gfc_option.allow_std & GFC_STD_F2008)) + { + if (context) + gfc_error ("Fortran 2008: Pointer functions in variable definition" + " context (%s) at %L", context, &e->where); + return FAILURE; + } + } + else if (e->expr_type != EXPR_VARIABLE) { if (context) gfc_error ("Non-variable expression in variable definition context (%s)" diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5abf927..e388ac1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-10-21 Tobias Burnus <burnus@net-b.de> + + PR fortran/46100 + * gfortran.dg/ptr-func-1.f90: New. + * gfortran.dg/ptr-func-2.f90: New. + 2010-10-20 Jakub Jelinek <jakub@redhat.com> PR tree-optimization/45919 diff --git a/gcc/testsuite/gfortran.dg/ptr-func-1.f90 b/gcc/testsuite/gfortran.dg/ptr-func-1.f90 new file mode 100644 index 0000000..b7c1fc9 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/ptr-func-1.f90 @@ -0,0 +1,24 @@ +! { dg-do compile } +! { dg-options "-std=f2008 -fall-intrinsics" } +! +! PR fortran/46100 +! +! Pointer function as definable actual argument +! - a Fortran 2008 feature +! +integer, target :: tgt +call one (two ()) +if (tgt /= 774) call abort () +contains + subroutine one (x) + integer, intent(inout) :: x + if (x /= 34) call abort () + x = 774 + end subroutine one + function two () + integer, pointer :: two + two => tgt + two = 34 + end function two +end + diff --git a/gcc/testsuite/gfortran.dg/ptr-func-2.f90 b/gcc/testsuite/gfortran.dg/ptr-func-2.f90 new file mode 100644 index 0000000..8275f14 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/ptr-func-2.f90 @@ -0,0 +1,24 @@ +! { dg-do compile } +! { dg-options "-std=f2003 -fall-intrinsics" } +! +! PR fortran/46100 +! +! Pointer function as definable actual argument +! - a Fortran 2008 feature +! +integer, target :: tgt +call one (two ()) ! { dg-error "Fortran 2008: Pointer functions" } +if (tgt /= 774) call abort () +contains + subroutine one (x) + integer, intent(inout) :: x + if (x /= 34) call abort () + x = 774 + end subroutine one + function two () + integer, pointer :: two + two => tgt + two = 34 + end function two +end + |