OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/34956 (-fbounds-check: bounds_check_9.f90: Use of uninitialized memory)

Browse Source 
PR fortran/34956
	* trans-array.c (gfc_conv_ss_startstride): Fix the logic to avoid
	checking bounds of absent optional arguments.

From-SVN: r133037
This commit is contained in:
Francois-Xavier Coudert 2008-03-08 18:22:31 +00:00 committed by François-Xavier Coudert
parent 9e94c78f82
commit ba4698e168
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-08 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR fortran/34956
* trans-array.c (gfc_conv_ss_startstride): Fix the logic to avoid
checking bounds of absent optional arguments.
2008-03-06 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR fortran/33197

44
gcc/fortran/trans-array.c
View File

@ -2924,9 +2924,13 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop)
for (ss = loop->ss; ss != gfc_ss_terminator; ss = ss->loop_chain)
{
stmtblock_t inner;
if (ss->type != GFC_SS_SECTION)
continue;
gfc_start_block (&inner);
/* TODO: range checking for mapped dimensions. */
info = &ss->data.info;
@ -2953,7 +2957,7 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop)
asprintf (&msg, "Zero stride is not allowed, for dimension %d "
"of array '%s'", info->dim[n]+1,
ss->expr->symtree->name);
gfc_trans_runtime_check (tmp, &block, &ss->expr->where, msg);
gfc_trans_runtime_check (tmp, &inner, &ss->expr->where, msg);
gfc_free (msg);
desc = ss->data.info.descriptor;
@ -2995,7 +2999,7 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop)
asprintf (&msg, "%s, lower bound of dimension %d of array '%s'"
" exceeded (%%ld < %%ld)", gfc_msg_fault,
info->dim[n]+1, ss->expr->symtree->name);
gfc_trans_runtime_check (tmp, &block, &ss->expr->where, msg,
gfc_trans_runtime_check (tmp, &inner, &ss->expr->where, msg,
fold_convert (long_integer_type_node,
info->start[n]),
fold_convert (long_integer_type_node,
@ -3011,7 +3015,7 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop)
asprintf (&msg, "%s, upper bound of dimension %d of array "
"'%s' exceeded (%%ld > %%ld)", gfc_msg_fault,
info->dim[n]+1, ss->expr->symtree->name);
gfc_trans_runtime_check (tmp, &block, &ss->expr->where, msg,
gfc_trans_runtime_check (tmp, &inner, &ss->expr->where, msg,
fold_convert (long_integer_type_node, info->start[n]),
fold_convert (long_integer_type_node, ubound));
gfc_free (msg);
@ -3033,7 +3037,7 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop)
asprintf (&msg, "%s, lower bound of dimension %d of array '%s'"
" exceeded (%%ld < %%ld)", gfc_msg_fault,
info->dim[n]+1, ss->expr->symtree->name);
gfc_trans_runtime_check (tmp, &block, &ss->expr->where, msg,
gfc_trans_runtime_check (tmp, &inner, &ss->expr->where, msg,
fold_convert (long_integer_type_node,
tmp2),
fold_convert (long_integer_type_node,
@ -3048,7 +3052,7 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop)
asprintf (&msg, "%s, upper bound of dimension %d of array "
"'%s' exceeded (%%ld > %%ld)", gfc_msg_fault,
info->dim[n]+1, ss->expr->symtree->name);
gfc_trans_runtime_check (tmp, &block, &ss->expr->where, msg,
gfc_trans_runtime_check (tmp, &inner, &ss->expr->where, msg,
fold_convert (long_integer_type_node, tmp2),
fold_convert (long_integer_type_node, ubound));
gfc_free (msg);
@ -3066,30 +3070,30 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop)
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);
gfc_trans_runtime_check (tmp3, &block, &ss->expr->where, msg,
gfc_trans_runtime_check (tmp3, &inner, &ss->expr->where, msg,
fold_convert (long_integer_type_node, tmp),
fold_convert (long_integer_type_node, size[n]));
gfc_free (msg);
}
else
size[n] = gfc_evaluate_now (tmp, &block);
size[n] = gfc_evaluate_now (tmp, &inner);
}
tmp = gfc_finish_block (&inner);
/* 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)
tmp = build3_v (COND_EXPR,
gfc_conv_expr_present (ss->expr->symtree->n.sym),
tmp, build_empty_stmt ());
gfc_add_expr_to_block (&block, tmp);
}
tmp = gfc_finish_block (&block);