Message ID | trinity-c705ebc7-b0ca-40e3-aebb-baffcb8ce7b4-1635716143837@3c-app-gmx-bap16 |
---|---|
State | New |
Headers | show |
Series | PR fortran/102715 - [12 Regression] ICE in gfc_simplify_transpose, at fortran/simplify.c:8184 | expand |
Early ping. Am 31.10.21 um 22:35 schrieb Harald Anlauf via Fortran: > Dear Fortranners, > > the fix for initialization of DT arrays caused an apparent regression for > cases where inconsistent ranks were used in such an initialization. > This caused either an ICE in subsequent uses of these arrays, or showed > up in valgrind as invalid reads, all of which seemed to be related to this > rank mismatch. > > The cleanest solution seems to be to strictly reject rank mismatch earlier > than we used to, which helps error recovery. I had to adjust one testcase > accordingly. > > The place I inserted the check does not distinguish between explicit shape > and implied shape. The Intel compiler does give a slightly different > error message for the implied shape case. If anyone feels strongly about > this, I'm open to suggestions for better choices of handling this. > > Regtested on x86_64-pc-linux-gnu. OK for mainline / affected branches? > > Thanks, > Harald >
Le 31/10/2021 à 22:35, Harald Anlauf via Fortran a écrit : > Dear Fortranners, > > the fix for initialization of DT arrays caused an apparent regression for > cases where inconsistent ranks were used in such an initialization. > This caused either an ICE in subsequent uses of these arrays, or showed > up in valgrind as invalid reads, all of which seemed to be related to this > rank mismatch. > > The cleanest solution seems to be to strictly reject rank mismatch earlier > than we used to, which helps error recovery. I had to adjust one testcase > accordingly. > > The place I inserted the check does not distinguish between explicit shape > and implied shape. The Intel compiler does give a slightly different > error message for the implied shape case. If anyone feels strongly about > this, I'm open to suggestions for better choices of handling this. > > Regtested on x86_64-pc-linux-gnu. OK for mainline / affected branches? > OK, thanks. Mikael
commit b1b5e5da928accfe02a7289a331cbea815255a16 Author: Harald Anlauf <anlauf@gmx.de> Date: Sun Oct 31 22:20:01 2021 +0100 Fortran: error recovery on rank mismatch of array and its initializer gcc/fortran/ChangeLog: PR fortran/102715 * decl.c (add_init_expr_to_sym): Reject rank mismatch between array and its initializer. gcc/testsuite/ChangeLog: PR fortran/102715 * gfortran.dg/pr68019.f90: Adjust error message. * gfortran.dg/pr102715.f90: New test. diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 2788348d1be..141fdef8c61 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -2105,6 +2105,14 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus) } } + if (sym->attr.flavor == FL_PARAMETER && sym->attr.dimension && sym->as + && sym->as->rank && init->rank && init->rank != sym->as->rank) + { + gfc_error ("Rank mismatch of array at %L and its initializer " + "(%d/%d)", &sym->declared_at, sym->as->rank, init->rank); + return false; + } + /* If sym is implied-shape, set its upper bounds from init. */ if (sym->attr.flavor == FL_PARAMETER && sym->attr.dimension && sym->as->type == AS_IMPLIED_SHAPE) diff --git a/gcc/testsuite/gfortran.dg/pr102715.f90 b/gcc/testsuite/gfortran.dg/pr102715.f90 new file mode 100644 index 00000000000..7b29a1c05a6 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr102715.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! PR fortran/102715 - ICE in gfc_simplify_transpose + +program p + type t + end type + type(t), parameter :: a(4) = t() + type(t), parameter :: b(2,2) = reshape(a, [2]) ! { dg-error "Rank mismatch" } + type(t), parameter :: c(2,2) = transpose(b) ! { dg-error "must be of rank 2" } + type(t), parameter :: s2(*) = b(2,:) ! { dg-error "Syntax error" } + type(t), parameter :: x(*,*) = reshape(a, [2]) ! { dg-error "Rank mismatch" } + type(t), parameter :: s3(*) = x(2,:) ! { dg-error "Syntax error" } +end diff --git a/gcc/testsuite/gfortran.dg/pr68019.f90 b/gcc/testsuite/gfortran.dg/pr68019.f90 index 2e304c3a260..77fd55bd331 100644 --- a/gcc/testsuite/gfortran.dg/pr68019.f90 +++ b/gcc/testsuite/gfortran.dg/pr68019.f90 @@ -9,5 +9,5 @@ program p integer :: n end type type(t), parameter :: vec(*) = [(t(i), i = 1, 4)] - type(t), parameter :: arr(*) = reshape(vec, [2, 2]) ! { dg-error "ranks 1 and 2 in assignment" } + type(t), parameter :: arr(*) = reshape(vec, [2, 2]) ! { dg-error "Rank mismatch" } end