From d618d2f45b791a5c2d909eb8a0ac281ed43bafe3 Mon Sep 17 00:00:00 2001 From: tkoenig Date: Sat, 22 Dec 2007 17:43:54 +0000 Subject: [PATCH] 2007-12-22 Thomas Koenig PR fortran/34549 * check.c (gfc_check_cshift): Add check that shift is type INTEGER. 2007-12-22 Thomas Koenig PR fortran/34549 * cshift_shift_real_1.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131136 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/check.c | 3 +++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/cshift_shift_real_1.f90 | 8 ++++++++ 4 files changed, 22 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/cshift_shift_real_1.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c67dca5f837..a5bf542ac1f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-12-22 Thomas Koenig + + PR fortran/34549 + * check.c (gfc_check_cshift): Add check that shift is + type INTEGER. + 2007-12-21 Jerry DeLisle PR fortran/34540 diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index 511dce63c12..9cc4d8570de 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -853,6 +853,9 @@ gfc_check_cshift (gfc_expr *array, gfc_expr *shift, gfc_expr *dim) if (array_check (array, 0) == FAILURE) return FAILURE; + if (type_check (shift, 1, BT_INTEGER) == FAILURE) + return FAILURE; + if (array->rank == 1) { if (scalar_check (shift, 1) == FAILURE) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5bc4828223b..f079ae640ad 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-12-22 Thomas Koenig + + PR fortran/34549 + * cshift_shift_real_1.f90: New test. + 2007-12-21 Jerry DeLisle PR fortran/34540 diff --git a/gcc/testsuite/gfortran.dg/cshift_shift_real_1.f90 b/gcc/testsuite/gfortran.dg/cshift_shift_real_1.f90 new file mode 100644 index 00000000000..93f4a1cd484 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/cshift_shift_real_1.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR 34549 - a real value was accepted for shift. +program main + implicit none + real, dimension(2,2) :: r + data r /1.0, 2.0, 3.0, 4.0/ + print *,cshift(r,shift=2.3,dim=1) ! { dg-error "must be INTEGER" } +end program main -- 2.11.4.GIT