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

re PR fortran/36192 (ICE with wrong index types and bad parens)

Browse Source 
2015-10-26  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/36192
	* array.c (gfc_ref_dimen_size): Check for BT_INTEGER before calling
	mpz_set.


2015-10-26  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/36192
	* gfortran.dg/pr36192.f90: New test.

From-SVN: r229387
This commit is contained in:
Steven G. Kargl 2015-10-26 17:39:07 +00:00
parent f6c1575958
commit 15c918bc76
4 changed files with 24 additions and 2 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 @@
2015-10-26 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/36192
* array.c (gfc_ref_dimen_size): Check for BT_INTEGER before calling
mpz_set.
2015-10-26 Andre Vehreschild <vehre@gcc.gnu.org>
PR fortran/66927

6
gcc/fortran/array.c
View File

@ -2208,7 +2208,8 @@ gfc_ref_dimen_size (gfc_array_ref *ar, int dimen, mpz_t *result, mpz_t *end)
if (ar->start[dimen] == NULL)
{
if (ar->as->lower[dimen] == NULL
|| ar->as->lower[dimen]->expr_type != EXPR_CONSTANT)
|| ar->as->lower[dimen]->expr_type != EXPR_CONSTANT
|| ar->as->lower[dimen]->ts.type != BT_INTEGER)
goto cleanup;
mpz_set (lower, ar->as->lower[dimen]->value.integer);
}
@ -2222,7 +2223,8 @@ gfc_ref_dimen_size (gfc_array_ref *ar, int dimen, mpz_t *result, mpz_t *end)
if (ar->end[dimen] == NULL)
{
if (ar->as->upper[dimen] == NULL
|| ar->as->upper[dimen]->expr_type != EXPR_CONSTANT)
|| ar->as->upper[dimen]->expr_type != EXPR_CONSTANT
|| ar->as->upper[dimen]->ts.type != BT_INTEGER)
goto cleanup;
mpz_set (upper, ar->as->upper[dimen]->value.integer);
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2015-10-26 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/36192
* gfortran.dg/pr36192.f90: New test.
2015-10-26 Eric Botcazou <ebotcazou@adacore.com>
* gcc.dg/atomic-noinline.c: Change test on __atomic_is_lock_free.

9
gcc/testsuite/gfortran.dg/pr36192.f90 Normal file
View File

@ -0,0 +1,9 @@
! { dg-do compile }
! PR fortran/36192.f90
!
program three_body
real, parameter :: n = 2, d = 2
real, dimension(n,d) :: x ! { dg-error "of INTEGER type|of INTEGER type" }
x(1,:) = (/ 1.0, 0.0 /)
end program three_body
! { dg-prune-output "have constant shape" }