diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/substring_integer_index.f90 | 8 |
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4bfcec4..4f02462 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 2011-10-30 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/50524 + * resolve.c (resolve_ref): Check return value of resolve_substring(). + +2011-10-30 Steven G. Kargl <kargl@gcc.gnu.org> + * io.c (match_dt_format): Match a user-defined operator or a kind type prefixed string. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 0d7e030..30f5f55 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -4846,7 +4846,8 @@ resolve_ref (gfc_expr *expr) break; case REF_SUBSTRING: - resolve_substring (ref); + if (resolve_substring (ref) == FAILURE) + return FAILURE; break; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1e4f7ef..5da63c4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2011-10-20 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/50524 + * gfortran.dg/substring_integer_index.f90: New test. + +2011-10-20 Steven G. Kargl <kargl@gcc.gnu.org> + * gfortran.dg/format_string.f: New test. diff --git a/gcc/testsuite/gfortran.dg/substring_integer_index.f90 b/gcc/testsuite/gfortran.dg/substring_integer_index.f90 new file mode 100644 index 0000000..a730a75 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/substring_integer_index.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/50524 +! +program foo + print *, 'abc'(2.e0:3) ! { dg-error "must be of type INTEGER" } + print *,'qwe'(1:1e0) ! { dg-error "must be of type INTEGER" } +end program foo + |