aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-11-20 16:21:12 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2008-11-20 16:21:12 +0100
commit8c3ed71edb8aaab3973092991c20cedb8560bb50 (patch)
treead2c3fa4066a22840aa2736f513ba2996f8a41fd /gcc
parent97e274e76fc7f31b2faeaced0700eb280d4b4478 (diff)
downloadgcc-8c3ed71edb8aaab3973092991c20cedb8560bb50.zip
gcc-8c3ed71edb8aaab3973092991c20cedb8560bb50.tar.gz
gcc-8c3ed71edb8aaab3973092991c20cedb8560bb50.tar.bz2
trans-intrinsic.c (gfc_conv_intrinsic_minmaxloc): Use gfc_index_one_node.
* trans-intrinsic.c (gfc_conv_intrinsic_minmaxloc): Use gfc_index_one_node. (gfc_conv_intrinsic_size): Use gfc_index_{zero,one}_node. From-SVN: r142046
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog4
-rw-r--r--gcc/fortran/trans-intrinsic.c13
2 files changed, 10 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5659329..1316eb6 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,9 @@
2008-11-20 Jakub Jelinek <jakub@redhat.com>
+ * trans-intrinsic.c (gfc_conv_intrinsic_minmaxloc): Use
+ gfc_index_one_node.
+ (gfc_conv_intrinsic_size): Use gfc_index_{zero,one}_node.
+
PR fortran/38181
* trans-intrinsic.c (gfc_conv_intrinsic_size): Inline 2 argument
size if the second argument is not optional and one argument size
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 22e30ab..629ec0a 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -2209,7 +2209,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, int op)
tmp = fold_build2 (MINUS_EXPR, gfc_array_index_type,
gfc_index_one_node, loop.from[0]);
else
- tmp = build_int_cst (gfc_array_index_type, 1);
+ tmp = gfc_index_one_node;
gfc_add_modify (&block, offset, tmp);
@@ -3422,14 +3422,13 @@ gfc_conv_intrinsic_size (gfc_se * se, gfc_expr * expr)
else
{
se->expr = NULL_TREE;
- argse.expr = fold_build2 (MINUS_EXPR,
- gfc_array_index_type, argse.expr,
- build_int_cst (gfc_array_index_type, 1));
+ argse.expr = fold_build2 (MINUS_EXPR, gfc_array_index_type,
+ argse.expr, gfc_index_one_node);
}
}
else if (expr->value.function.actual->expr->rank == 1)
{
- argse.expr = build_int_cst (gfc_array_index_type, 0);
+ argse.expr = gfc_index_zero_node;
se->expr = NULL_TREE;
}
else
@@ -3445,9 +3444,9 @@ gfc_conv_intrinsic_size (gfc_se * se, gfc_expr * expr)
se->expr = fold_build2 (MINUS_EXPR, gfc_array_index_type,
ubound, lbound);
se->expr = fold_build2 (PLUS_EXPR, gfc_array_index_type, se->expr,
- build_int_cst (gfc_array_index_type, 1));
+ gfc_index_one_node);
se->expr = fold_build2 (MAX_EXPR, gfc_array_index_type, se->expr,
- build_int_cst (gfc_array_index_type, 0));
+ gfc_index_zero_node);
}
type = gfc_typenode_for_spec (&expr->ts);