aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-array.c
diff options
context:
space:
mode:
authorFrancois-Xavier Coudert <fxcoudert@gcc.gnu.org>2007-09-18 21:25:40 +0000
committerFrançois-Xavier Coudert <fxcoudert@gcc.gnu.org>2007-09-18 21:25:40 +0000
commita50ba82d5881be3796d3a9054092dfd4a615bcfa (patch)
tree840b670afbca3676c80e2e73b02d1cc9ae3a0c25 /gcc/fortran/trans-array.c
parentbf962a2a455efcd5b1afe2df85374db48165ef1a (diff)
downloadgcc-a50ba82d5881be3796d3a9054092dfd4a615bcfa.zip
gcc-a50ba82d5881be3796d3a9054092dfd4a615bcfa.tar.gz
gcc-a50ba82d5881be3796d3a9054092dfd4a615bcfa.tar.bz2
re PR fortran/31119 (-fbounds-check: Check for presence of optional arguments before bound checking)
PR fortran/31119 * trans-array.c (gfc_conv_ss_startstride): Only perform bounds checking for optional args when they are present. * gfortran.dg/bounds_check_9.f90: New test. * gfortran.dg/bounds_check_fail_2.f90: New test. From-SVN: r128587
Diffstat (limited to 'gcc/fortran/trans-array.c')
-rw-r--r--gcc/fortran/trans-array.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 1e02b81..64a62db 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -2993,8 +2993,22 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop)
others against this. */
if (size[n])
{
- tree tmp3
- = fold_build2 (NE_EXPR, boolean_type_node, tmp, size[n]);
+ tree tmp3;
+
+ tmp3 = fold_build2 (NE_EXPR, boolean_type_node, tmp, size[n]);
+
+ /* For optional arguments, only check bounds if the
+ argument is present. */
+ if (ss->expr->symtree->n.sym->attr.optional
+ || ss->expr->symtree->n.sym->attr.not_always_present)
+ {
+ tree cond;
+
+ cond = gfc_conv_expr_present (ss->expr->symtree->n.sym);
+ tmp3 = fold_build2 (TRUTH_AND_EXPR, boolean_type_node,
+ cond, tmp3);
+ }
+
asprintf (&msg, "%s, size mismatch for dimension %d "
"of array '%s' (%%ld/%%ld)", gfc_msg_bounds,
info->dim[n]+1, ss->expr->symtree->name);