| Message ID | trinity-f58228a4-d353-4715-aa77-0e783ba85132-1621362978041@3c-app-gmx-bap67 |
|---|---|
| State | New |
| Headers | show |
| Series | PR fortran/100602 - [11/12 Regression] Erroneous "pointer argument is not associated" runtime error | expand |
*PING* > Gesendet: Dienstag, 18. Mai 2021 um 20:36 Uhr > Von: "Harald Anlauf" <anlauf@gmx.de> > An: "fortran" <fortran@gcc.gnu.org>, "gcc-patches" <gcc-patches@gcc.gnu.org> > Betreff: [PATCH] PR fortran/100602 - [11/12 Regression] Erroneous "pointer argument is not associated" runtime error > > The generation of the new runtime check picked up the wrong attributes > in the case of CLASS array arguments. There is related new code in > gfc_conv_procedure_call which served as reference for the fix. > > Regtested on x86_64-pc-linux-gnu. > > OK for mainline / 11-branch? > > Thanks, > Harald > > > Fortran: Fix erroneous "pointer argument is not associated" runtime error > > For CLASS arrays we need to use the CLASS data attributes to determine > which runtime check to generate. > > gcc/fortran/ChangeLog: > > PR fortran/100602 > * trans-intrinsic.c (gfc_conv_intrinsic_size): Use CLASS data > attributes for CLASS arrays for generation of runtime error. > > gcc/testsuite/ChangeLog: > > PR fortran/100602 > * gfortran.dg/pointer_check_14.f90: New test. > >
On 5/18/21 11:36 AM, Harald Anlauf via Fortran wrote: > The generation of the new runtime check picked up the wrong attributes > in the case of CLASS array arguments. There is related new code in > gfc_conv_procedure_call which served as reference for the fix. > > Regtested on x86_64-pc-linux-gnu. > > OK for mainline / 11-branch? > > Thanks, > Harald > > > Fortran: Fix erroneous "pointer argument is not associated" runtime error > > For CLASS arrays we need to use the CLASS data attributes to determine > which runtime check to generate. > > gcc/fortran/ChangeLog: > > PR fortran/100602 > * trans-intrinsic.c (gfc_conv_intrinsic_size): Use CLASS data > attributes for CLASS arrays for generation of runtime error. > > gcc/testsuite/ChangeLog: > > PR fortran/100602 > * gfortran.dg/pointer_check_14.f90: New test. > Yes, OK for both, thanks Jerry
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 4d7451479d3..7ad297905b5 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -7999,7 +7999,14 @@ gfc_conv_intrinsic_size (gfc_se * se, gfc_expr * expr) tree temp; tree cond; - attr = sym ? sym->attr : gfc_expr_attr (e); + if (e->symtree->n.sym && IS_CLASS_ARRAY (e->symtree->n.sym)) + { + attr = CLASS_DATA (e->symtree->n.sym)->attr; + attr.pointer = attr.class_pointer; + } + else + attr = gfc_expr_attr (e); + if (attr.allocatable) msg = xasprintf ("Allocatable argument '%s' is not allocated", e->symtree->n.sym->name); diff --git a/gcc/testsuite/gfortran.dg/pointer_check_14.f90 b/gcc/testsuite/gfortran.dg/pointer_check_14.f90 new file mode 100644 index 00000000000..8ef6b3611fa --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pointer_check_14.f90 @@ -0,0 +1,28 @@ +! { dg-do run } +! { dg-options "-fcheck=pointer -fdump-tree-original" } +! PR100602 - Erroneous "pointer argument is not associated" runtime error + +module m + type :: T + end type +contains + subroutine f(this) + class(T), intent(in) :: this(:) + class(T), allocatable :: ca(:) + class(T), pointer :: cp(:) + if (size (this) == 0) return + write(*,*) size (this) + stop 1 + write(*,*) size (ca) ! Check #1 + write(*,*) size (cp) ! Check #2 + end subroutine f +end module + +program main + use m + call f([T::]) +end program + +! { dg-final { scan-tree-dump-times "_gfortran_runtime_error_at" 2 "original" } } +! { dg-final { scan-tree-dump-times "Allocatable argument .*ca" 1 "original" } } +! { dg-final { scan-tree-dump-times "Pointer argument .*cp" 1 "original" } }