diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/iresolve.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f90a077..c67dca5 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2007-12-21 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR fortran/34540 + * iresolve.c (gfc_resolve_cshift): Take optional dim path + only if the argument is an optional itself. + * iresolve.c (gfc_resolve_eoshift): Same. + 2007-12-21 Paul Thomas <pault@gcc.gnu.org> PR fortran/34438 diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index a68e42e..cdc4ac1 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -590,7 +590,7 @@ gfc_resolve_cshift (gfc_expr *f, gfc_expr *array, gfc_expr *shift, if (dim != NULL) { - if (dim->expr_type != EXPR_CONSTANT) + if (dim->expr_type != EXPR_CONSTANT && dim->symtree->n.sym->attr.optional) { /* Mark this for later setting the type in gfc_conv_missing_dummy. */ dim->representation.length = shift->ts.kind; @@ -728,7 +728,7 @@ gfc_resolve_eoshift (gfc_expr *f, gfc_expr *array, gfc_expr *shift, if (dim != NULL) { - if (dim->expr_type != EXPR_CONSTANT) + if (dim->expr_type != EXPR_CONSTANT && dim->symtree->n.sym->attr.optional) { /* Mark this for later setting the type in gfc_conv_missing_dummy. */ dim->representation.length = shift->ts.kind; |