diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-13 09:54:03 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-13 09:54:03 +0000 |
| commit | ce8253317a218e6bcb6a574ca0093f291a9c1957 (patch) | |
| tree | 8994f075205f28e587e5bffbf03d1e9e3d9e5f25 | |
| parent | 111dca359bd9da9ec96003697f4d981adaf6d8f2 (diff) | |
| download | ppe42-gcc-ce8253317a218e6bcb6a574ca0093f291a9c1957.tar.gz ppe42-gcc-ce8253317a218e6bcb6a574ca0093f291a9c1957.zip | |
2005-12-13 Richard Guenther <rguenther@suse.de>
* trans-expr.c (gfc_conv_substring): Use fold_build2 and
build_int_cst.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108476 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ea1afe18cef..cc6824bb8b2 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2005-12-13 Richard Guenther <rguenther@suse.de> + + * trans-expr.c (gfc_conv_substring): Use fold_build2 and + build_int_cst. + 2005-12-13 Richard Sandiford <richard@codesourcery.com> * Make-lang.in (fortran/trans-resolve.o): Depend on diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 5e1535e7ea3..7def3ad6e80 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -246,12 +246,11 @@ gfc_conv_substring (gfc_se * se, gfc_ref * ref, int kind) gfc_conv_expr_type (&end, ref->u.ss.end, gfc_charlen_type_node); gfc_add_block_to_block (&se->pre, &end.pre); } - tmp = - build2 (MINUS_EXPR, gfc_charlen_type_node, - fold_convert (gfc_charlen_type_node, integer_one_node), - start.expr); - tmp = build2 (PLUS_EXPR, gfc_charlen_type_node, end.expr, tmp); - se->string_length = fold (tmp); + tmp = fold_build2 (MINUS_EXPR, gfc_charlen_type_node, + build_int_cst (gfc_charlen_type_node, 1), + start.expr); + tmp = fold_build2 (PLUS_EXPR, gfc_charlen_type_node, end.expr, tmp); + se->string_length = tmp; } |
