diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-11-20 01:37:43 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-11-20 01:37:43 +0000 |
| commit | e76e6ce3ffd67d572aea440a61f41f67a0fc1c4d (patch) | |
| tree | 8a68fc2c9d48c052a942710d7908b14ec1dd65c4 /gcc/fortran/trans-expr.c | |
| parent | 9fc1c58ff05f4209eb29e14997ab6f6d21dabf33 (diff) | |
| download | gcc-e76e6ce3ffd67d572aea440a61f41f67a0fc1c4d.zip gcc-e76e6ce3ffd67d572aea440a61f41f67a0fc1c4d.tar.gz gcc-e76e6ce3ffd67d572aea440a61f41f67a0fc1c4d.tar.bz2 | |
re PR fortran/33317 (CSHIFT/EOSHIFT: Rejects optional dummy for DIM=)
2007-11-19 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/33317
* trans-expr.c (gfc_conv_missing_dummy): Revert.
* iresolve.c (gfc_resolve_cshift): Revert.
(gfc_resolve_eoshift): Likewise.
* check.c (gfc_check_cshift): Revert.
(gfc_check_eoshift): Likewise.
From-SVN: r130304
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 69031fb..c15de4b 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -153,16 +153,8 @@ gfc_conv_missing_dummy (gfc_se * se, gfc_expr * arg, gfc_typespec ts) present = gfc_conv_expr_present (arg->symtree->n.sym); - /* Make sure the type is at least default integer kind to match certain - runtime library functions. (ie cshift and eoshift). */ - if (ts.type == BT_INTEGER && arg->symtree->n.sym->attr.untyped) - { - tmp = gfc_get_int_type (gfc_default_integer_kind); - tmp = fold_convert (tmp, se->expr); - } - else - tmp = build3 (COND_EXPR, TREE_TYPE (se->expr), present, se->expr, - fold_convert (TREE_TYPE (se->expr), integer_zero_node)); + tmp = build3 (COND_EXPR, TREE_TYPE (se->expr), present, se->expr, + fold_convert (TREE_TYPE (se->expr), integer_zero_node)); tmp = gfc_evaluate_now (tmp, &se->pre); se->expr = tmp; |