Commit bc4b3d2d by Mikael Morin

trans-intrinsic.c (gfc_conv_intrinsic_arith): Small argument handling cleanup.

	* trans-intrinsic.c (gfc_conv_intrinsic_arith): Small argument handling
	cleanup.

From-SVN: r180917
parent 6492221c
2011-11-04 Mikael Morin <mikael@gcc.gnu.org> 2011-11-04 Mikael Morin <mikael@gcc.gnu.org>
* trans-intrinsic.c (gfc_conv_intrinsic_arith): Small argument handling
cleanup.
2011-11-04 Mikael Morin <mikael@gcc.gnu.org>
* trans-intrinsic.c (gfc_conv_intrinsic_arith): Update conditions. * trans-intrinsic.c (gfc_conv_intrinsic_arith): Update conditions.
2011-11-04 Mikael Morin <mikael@gcc.gnu.org> 2011-11-04 Mikael Morin <mikael@gcc.gnu.org>
......
...@@ -2569,7 +2569,7 @@ gfc_conv_intrinsic_arith (gfc_se * se, gfc_expr * expr, enum tree_code op, ...@@ -2569,7 +2569,7 @@ gfc_conv_intrinsic_arith (gfc_se * se, gfc_expr * expr, enum tree_code op,
stmtblock_t block; stmtblock_t block;
tree tmp; tree tmp;
gfc_loopinfo loop; gfc_loopinfo loop;
gfc_actual_arglist *actual; gfc_actual_arglist *arg_array, *arg_mask;
gfc_ss *arrayss; gfc_ss *arrayss;
gfc_ss *maskss; gfc_ss *maskss;
gfc_se arrayse; gfc_se arrayse;
...@@ -2608,9 +2608,10 @@ gfc_conv_intrinsic_arith (gfc_se * se, gfc_expr * expr, enum tree_code op, ...@@ -2608,9 +2608,10 @@ gfc_conv_intrinsic_arith (gfc_se * se, gfc_expr * expr, enum tree_code op,
gfc_add_modify (&se->pre, resvar, tmp); gfc_add_modify (&se->pre, resvar, tmp);
arg_array = expr->value.function.actual;
/* Walk the arguments. */ /* Walk the arguments. */
actual = expr->value.function.actual; arrayexpr = arg_array->expr;
arrayexpr = actual->expr;
arrayss = gfc_walk_expr (arrayexpr); arrayss = gfc_walk_expr (arrayexpr);
gcc_assert (arrayss != gfc_ss_terminator); gcc_assert (arrayss != gfc_ss_terminator);
...@@ -2619,9 +2620,9 @@ gfc_conv_intrinsic_arith (gfc_se * se, gfc_expr * expr, enum tree_code op, ...@@ -2619,9 +2620,9 @@ gfc_conv_intrinsic_arith (gfc_se * se, gfc_expr * expr, enum tree_code op,
maskexpr = NULL; maskexpr = NULL;
else else
{ {
actual = actual->next->next; arg_mask = arg_array->next->next;
gcc_assert (actual); gcc_assert (arg_mask != NULL);
maskexpr = actual->expr; maskexpr = arg_mask->expr;
} }
if (maskexpr && maskexpr->rank > 0) if (maskexpr && maskexpr->rank > 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment