diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/array.c | 24 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 3 |
3 files changed, 26 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c300145..961167b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -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 diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 2fc9dfa..1430e80 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -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) - { - gfc_error ("Expecting a scalar INTEGER expression at %C"); + 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, 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; } diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 12a8f32..a631010 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -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); |