procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/68566 (ICE on using unusable array in reshape (double free or corruption))

Browse source 
2016-04-09  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/68566
	* array.c (match_array_element_spec): Add check for non-integer.
	* simplify.c (gfc_simplify_reshape): If source shape is NULL return.

	PR fortran/68566
	* gfortran.dg/pr36192.f90: Update test.
	* gfortran.dg/pr36192_1.f90: Update test.
	* gfortran.dg/real_dimension_1.f: Update test.
	* gfortran.dg/parameter_array_init_7.f90: New test.

From-SVN: r234864
This commit is contained in:
Jerry DeLisle 2016-04-09 19:09:02 +00:00
parent c532c87139
commit a5edb32e6b
8 changed files with 49 additions and 15 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 @@
2016-04-09 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/68566
* array.c (match_array_element_spec): Add check for non-integer.
* simplify.c (gfc_simplify_reshape): If source shape is NULL return.
2016-04-06 Patrick Palka <ppalka@gcc.gnu.org>
PR c/70436

22
gcc/fortran/array.c
View file

@ -421,10 +421,15 @@ match_array_element_spec (gfc_array_spec *as)
if (!gfc_expr_check_typed (*upper, gfc_current_ns, false))
return AS_UNKNOWN;
if ((*upper)->expr_type == EXPR_FUNCTION && (*upper)->ts.type == BT_UNKNOWN
&& (*upper)->symtree && strcmp ((*upper)->symtree->name, "null") == 0)
if (((*upper)->expr_type == EXPR_CONSTANT
&& (*upper)->ts.type != BT_INTEGER) ||
((*upper)->expr_type == EXPR_FUNCTION
&& (*upper)->ts.type == BT_UNKNOWN
&& (*upper)->symtree
&& strcmp ((*upper)->symtree->name, "null") == 0))
{
gfc_error ("Expecting a scalar INTEGER expression at %C");
gfc_error ("Expecting a scalar INTEGER expression at %C, found %s",
gfc_basic_typename ((*upper)->ts.type));
return AS_UNKNOWN;
}
@ -448,10 +453,15 @@ match_array_element_spec (gfc_array_spec *as)
if (!gfc_expr_check_typed (*upper, gfc_current_ns, false))
return AS_UNKNOWN;
if ((*upper)->expr_type == EXPR_FUNCTION && (*upper)->ts.type == BT_UNKNOWN
&& (*upper)->symtree && strcmp ((*upper)->symtree->name, "null") == 0)
if (((*upper)->expr_type == EXPR_CONSTANT
&& (*upper)->ts.type != BT_INTEGER) ||
((*upper)->expr_type == EXPR_FUNCTION
&& (*upper)->ts.type == BT_UNKNOWN
&& (*upper)->symtree
&& strcmp ((*upper)->symtree->name, "null") == 0))
{
gfc_error ("Expecting a scalar INTEGER expression at %C");
gfc_error ("Expecting a scalar INTEGER expression at %C, found %s",
gfc_basic_typename ((*upper)->ts.type));
return AS_UNKNOWN;
}

3
gcc/fortran/simplify.c
View file

@ -5163,6 +5163,9 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
|| !is_constant_array_expr (order_exp))
return NULL;
if (source->shape == NULL)
return NULL;
/* Proceed with simplification, unpacking the array. */
mpz_init (index);

8
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,11 @@
2016-04-09 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/68566
* gfortran.dg/pr36192.f90: Update test.
* gfortran.dg/pr36192_1.f90: Update test.
* gfortran.dg/real_dimension_1.f: Update test.
* gfortran.dg/parameter_array_init_7.f90: New test.
2016-04-09 John David Anglin <danglin@gcc.gnu.org>
PR testsuite/64039

8
gcc/testsuite/gfortran.dg/parameter_array_init_7.f90 Normal file
View file

@ -0,0 +1,8 @@
! { dg-do compile }
! PR68566 ICE on using unusable array in reshape
program p
integer, parameter :: n = 2
integer, parameter :: a(:) = 0 !{ dg-error "automatic or of deferred shape" }
integer, parameter :: b(n, n) = reshape([a, 1+a], [n, n])
end

5
gcc/testsuite/gfortran.dg/pr36192.f90
View file

@ -3,7 +3,6 @@
!
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 /)
real, dimension(n,d) :: x ! { dg-error "Expecting a scalar INTEGER" }
x(1,:) = (/ 1.0, 0.0 /) ! { dg-error "Unclassifiable" }
end program three_body
! { dg-prune-output "have constant shape" }

4
gcc/testsuite/gfortran.dg/pr36192_1.f90
View file

@ -2,11 +2,11 @@
! PR fortran/36192
program three_body
real, parameter :: n = 2, d = 2
real, dimension(n,d) :: x_hq ! { dg-error "of INTEGER type|of INTEGER type" }
real, dimension(n,d) :: x_hq ! { dg-error "Expecting a scalar INTEGER" }
call step(x_hq)
contains
subroutine step(x)
real, dimension(:,:), intent(in) :: x
end subroutine step
end program three_body
! { dg-prune-output "must have constant shape" }
! { dg-prune-output "Rank mismatch in argument" }

8
gcc/testsuite/gfortran.dg/real_dimension_1.f
View file

@ -1,7 +1,7 @@
! { dg-do compile }
! PR 34305 - make sure there's an error message for specifying a
! PR 34305 - Test for specifying a real as dimension
program test
parameter (datasize = 1000)
dimension idata (datasize) ! { dg-error "must be of INTEGER type|must have constant shape" }
idata (1) = -1
real , parameter :: dsize = 1000
dimension idata (dsize) ! { dg-error "scalar INTEGER expression" }
idata (1) = -1 ! { dg-error "must have the pointer attribute" }
end