diff options
| author | Tobias Burnus <burnus@net-b.de> | 2012-04-16 23:47:35 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2012-04-16 23:47:35 +0200 |
| commit | 4a1016814c2121920459d13ccb4c841b3a537951 (patch) | |
| tree | 6f8f9a6dfa3ca63e08395668b8ea280c79920cb5 | |
| parent | de86e0a5d32fcaa2ec236f745fe7713cdedbaad4 (diff) | |
| download | gcc-4a1016814c2121920459d13ccb4c841b3a537951.zip gcc-4a1016814c2121920459d13ccb4c841b3a537951.tar.gz gcc-4a1016814c2121920459d13ccb4c841b3a537951.tar.bz2 | |
[multiple changes]
2012-04-12 Tobias Burnus <burnus@net-b.de>
PR fortran/52864
* expr.c (gfc_check_vardef_context): Fix assignment check for
pointer components.
2012-04-16 Tobias Burnus <burnus@net-b.de>
PR fortran/52864
* gfortran.dg/pointer_intent_6.f90: New.
From-SVN: r186507
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pointer_intent_6.f90 | 19 |
4 files changed, 40 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 18e17cd..9793c8b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2012-04-16 Tobias Burnus <burnus@net-b.de> + + PR fortran/52864 + * expr.c (gfc_check_vardef_context): Fix assignment check for + pointer components. + 2012-04-16 Janus Weil <janus@gcc.gnu.org> PR fortran/52968 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index e6a9c88..d961441 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -4645,9 +4645,11 @@ gfc_check_vardef_context (gfc_expr* e, bool pointer, bool alloc_obj, return FAILURE; } - /* INTENT(IN) dummy argument. Check this, unless the object itself is - the component of sub-component of a pointer. Obviously, - procedure pointers are of no interest here. */ + /* INTENT(IN) dummy argument. Check this, unless the object itself is the + component of sub-component of a pointer; we need to distinguish + assignment to a pointer component from pointer-assignment to a pointer + component. Note that (normal) assignment to procedure pointers is not + possible. */ check_intentin = true; ptr_component = (sym->ts.type == BT_CLASS && CLASS_DATA (sym)) ? CLASS_DATA (sym)->attr.class_pointer : sym->attr.pointer; @@ -4656,7 +4658,11 @@ gfc_check_vardef_context (gfc_expr* e, bool pointer, bool alloc_obj, if (ptr_component && ref->type == REF_COMPONENT) check_intentin = false; if (ref->type == REF_COMPONENT && ref->u.c.component->attr.pointer) - ptr_component = true; + { + ptr_component = true; + if (!pointer) + check_intentin = false; + } } if (check_intentin && sym->attr.intent == INTENT_IN) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b07f556..79a724e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2012-04-16 Tobias Burnus <burnus@net-b.de> + PR fortran/52864 + * gfortran.dg/pointer_intent_6.f90: New. + +2012-04-16 Tobias Burnus <burnus@net-b.de> + PR fortran/52916 * gfortran.dg/public_private_module_3.f90: Use dg-additional-sources to include public_private_module_4.f90. diff --git a/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 b/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 new file mode 100644 index 0000000..56c7de5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 @@ -0,0 +1,19 @@ +! { dg-do compile } +! +! PR fortran/52864 +! +! Assigning to an intent(in) pointer (which is valid). +! + program test + type PoisFFT_Solver3D + complex, dimension(:,:,:), & + pointer :: work => null() + end type PoisFFT_Solver3D + contains + subroutine PoisFFT_Solver3D_FullPeriodic(D, p) + type(PoisFFT_Solver3D), intent(in) :: D + real, intent(in), pointer :: p(:) + D%work(i,j,k) = 0.0 + p = 0.0 + end subroutine + end |