From 7522a064991a90ac167f51ff021df39975af067d Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Tue, 8 Feb 2011 23:51:04 +0100 Subject: [PATCH] re PR fortran/45290 ([F08] pointer initialization) 2011-02-08 Janus Weil PR fortran/45290 * expr.c (gfc_check_assign_symbol): Reject pointers as pointer initialization target. 2011-02-08 Janus Weil PR fortran/45290 * gfortran.dg/pointer_init_6.f90: New. From-SVN: r169948 --- gcc/fortran/ChangeLog | 6 +++ gcc/fortran/expr.c | 14 ++++++- gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/gfortran.dg/pointer_init_6.f90 | 39 ++++++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pointer_init_6.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4463c8d5e38..8ee85c15b94 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-02-08 Janus Weil + + PR fortran/45290 + * expr.c (gfc_check_assign_symbol): Reject pointers as pointer + initialization target. + 2011-02-07 Janne Blomqvist Ralf Wildenhues diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index bcc23fc325a..b30bc64d74a 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3608,7 +3608,7 @@ gfc_check_assign_symbol (gfc_symbol *sym, gfc_expr *rvalue) "must not be ALLOCATABLE "); return FAILURE; } - if (!attr.target) + if (!attr.target || attr.pointer) { gfc_error ("Pointer initialization target at %C " "must have the TARGET attribute"); @@ -3621,6 +3621,18 @@ gfc_check_assign_symbol (gfc_symbol *sym, gfc_expr *rvalue) return FAILURE; } } + + if (sym->attr.proc_pointer && rvalue->expr_type != EXPR_NULL) + { + /* F08:C1220. Additional checks for procedure pointer initialization. */ + symbol_attribute attr = gfc_expr_attr (rvalue); + if (attr.proc_pointer) + { + gfc_error ("Procedure pointer initialization target at %L " + "may not be a procedure pointer", &rvalue->where); + return FAILURE; + } + } return SUCCESS; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5a4fb3dbe71..1ec8fd246e1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-02-08 Janus Weil + + PR fortran/45290 + * gfortran.dg/pointer_init_6.f90: New. + 2011-02-08 Jeff Law PR tree-optimization/42893 diff --git a/gcc/testsuite/gfortran.dg/pointer_init_6.f90 b/gcc/testsuite/gfortran.dg/pointer_init_6.f90 new file mode 100644 index 00000000000..92cece3a8ed --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pointer_init_6.f90 @@ -0,0 +1,39 @@ +! { dg-do compile } +! +! PR 45290: [F08] pointer initialization +! +! Contributed by Janus Weil + +module m1 + implicit none + type :: t + integer, pointer :: p + integer :: i + end type + integer, target :: i + type(t), target :: x + integer, pointer :: p1 => i + integer, pointer :: p2 => p1 ! { dg-error "must have the TARGET attribute" } + integer, pointer :: p3 => x%p ! { dg-error "must have the TARGET attribute" } + integer, pointer :: p4 => x%i +end module m1 + + +module m2 + + type :: t + procedure(s), pointer, nopass :: ppc + end type + type(t) :: x + procedure(s), pointer :: pp1 => s + procedure(s), pointer :: pp2 => pp1 ! { dg-error "may not be a procedure pointer" } + procedure(s), pointer :: pp3 => t%ppc ! { dg-error "Syntax error" } + +contains + + subroutine s + end subroutine + +end module m2 + +! { dg-final { cleanup-modules "m1 m2" } } -- 2.30.2