diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr35849.f90 | 9 |
4 files changed, 25 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9ecdc82..37481e5 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2016-07-04 Jerry DeLisle <jvdelisle@gcc.gnu.org> + Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/35849 + * simplify.c (gfc_simplify_ishftc): Check that absolute value of + SHIFT is less than or equal to SIZE. + 2016-07-01 Jakub Jelinek <jakub@redhat.com> PR fortran/71687 diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index a631010..4c8bb83 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -3280,7 +3280,6 @@ gfc_simplify_ishftc (gfc_expr *e, gfc_expr *s, gfc_expr *sz) return NULL; gfc_extract_int (sz, &ssize); - } else ssize = isize; @@ -3294,7 +3293,10 @@ gfc_simplify_ishftc (gfc_expr *e, gfc_expr *s, gfc_expr *sz) { if (sz == NULL) gfc_error ("Magnitude of second argument of ISHFTC exceeds " - "BIT_SIZE of first argument at %L", &s->where); + "BIT_SIZE of first argument at %C"); + else + gfc_error ("Absolute value of SHIFT shall be less than or equal " + "to SIZE at %C"); return &gfc_bad_expr; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9e819ac..1c6ff51 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-07-04 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR fortran/35849 + * gfortran.dg: pr35849.f90: New test. + 2016-07-04 Jakub Jelinek <jakub@redhat.com> PR c++/71739 diff --git a/gcc/testsuite/gfortran.dg/pr35849.f90 b/gcc/testsuite/gfortran.dg/pr35849.f90 new file mode 100644 index 0000000..39ba48c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr35849.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! PR35849 +INTEGER, PARAMETER :: j = 15 +INTEGER, PARAMETER, DIMENSION(10) :: A = [(i, i = 1,10)] +INTEGER, PARAMETER, DIMENSION(10) :: B = ISHFTC(j, A, -20) ! { dg-error "must be positive" } +INTEGER, PARAMETER, DIMENSION(10) :: C = ISHFTC(1_1, A, j) ! { dg-error "less than or equal to BIT_SIZE" } +INTEGER, PARAMETER, DIMENSION(10) :: D = ISHFTC(3, A, 5) ! { dg-error "Absolute value of SHIFT shall be less than or equal" } +INTEGER, PARAMETER, DIMENSION(10) :: E = ISHFTC(3_1, A) ! { dg-error "second argument of ISHFTC exceeds BIT_SIZE of first argument" } +end |