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

re PR fortran/85102 (ICE in gfc_conv_intrinsic_dot_product, at fortran/trans-intrinsic.c:4464)

Browse Source 
2018-04-02  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/85102
	* decl.c (variable_decl): If upper or lower bounds simplify
	to a constant, use that.

2018-04-02  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/85102
	* gfortran.dg/array_simplify_2.f90: New test.

From-SVN: r259014
This commit is contained in:
Thomas Koenig 2018-04-02 16:47:48 +00:00
parent c54a138f84
commit 078c5aff5e
4 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2018-04-02 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/85102
* decl.c (variable_decl): If upper or lower bounds simplify
to a constant, use that.
2018-03-30 Paul Thomas <pault@gcc.gnu.org>
PR fortran/84931

27
gcc/fortran/decl.c
View File

@ -2424,6 +2424,33 @@ variable_decl (int elem)
goto cleanup;
}
}
if (as->type == AS_EXPLICIT)
{
for (int i = 0; i < as->rank; i++)
{
gfc_expr *e, *n;
e = as->lower[i];
if (e->expr_type != EXPR_CONSTANT)
{
n = gfc_copy_expr (e);
gfc_simplify_expr (n, 1);
if (n->expr_type == EXPR_CONSTANT)
gfc_replace_expr (e, n);
else
gfc_free_expr (n);
}
e = as->upper[i];
if (e->expr_type != EXPR_CONSTANT)
{
n = gfc_copy_expr (e);
gfc_simplify_expr (n, 1);
if (n->expr_type == EXPR_CONSTANT)
gfc_replace_expr (e, n);
else
gfc_free_expr (n);
}
}
}
}
char_len = NULL;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2018-04-02 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/85102
* gfortran.dg/array_simplify_2.f90: New test.
2018-04-01 Jakub Jelinek <jakub@redhat.com>
PR middle-end/85090

11
gcc/testsuite/gfortran.dg/array_simplify_2.f90 Normal file
View File

@ -0,0 +1,11 @@
! { dg-do run }
! PR 85102 - this used to ICE
! Original test case by Gerhard Steinmetz
program p
integer, parameter :: a((1+2)) = 1
integer, parameter :: b((1+1)+1) = 1
integer, parameter :: c = dot_product(a, a)
integer, parameter :: d = dot_product(b,b)
if (c /= 3) stop 1
if (d /= 3) stop 2
end program p