OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Harald Anlauf 2021-11-06 19:42:01 +01:00
parent 6b8152b96c
commit df2135e88a
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/fortran/decl.c
View File

@ -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)

13
gcc/testsuite/gfortran.dg/pr102715.f90 Normal file
View File

@ -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

2
gcc/testsuite/gfortran.dg/pr68019.f90
View File

@ -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