diff options
| author | Mikael Morin <mikael@gcc.gnu.org> | 2011-11-04 00:19:11 +0000 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2011-11-04 00:19:11 +0000 |
| commit | bc4b3d2dfd47df4967669fbdf0851e49c51448d7 (patch) | |
| tree | d8bc3c5c143840ca1d82901a64a28f94d17ac7ad /gcc | |
| parent | 6492221c6c61be2d04e58f3a5bcc3f76316f3069 (diff) | |
| download | gcc-bc4b3d2dfd47df4967669fbdf0851e49c51448d7.zip gcc-bc4b3d2dfd47df4967669fbdf0851e49c51448d7.tar.gz gcc-bc4b3d2dfd47df4967669fbdf0851e49c51448d7.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/trans-intrinsic.c | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index be67d8d..4d78f77 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 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. 2011-11-04 Mikael Morin <mikael@gcc.gnu.org> diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 342d2cb..b701502 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -2569,7 +2569,7 @@ gfc_conv_intrinsic_arith (gfc_se * se, gfc_expr * expr, enum tree_code op, stmtblock_t block; tree tmp; gfc_loopinfo loop; - gfc_actual_arglist *actual; + gfc_actual_arglist *arg_array, *arg_mask; gfc_ss *arrayss; gfc_ss *maskss; gfc_se arrayse; @@ -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); + arg_array = expr->value.function.actual; + /* Walk the arguments. */ - actual = expr->value.function.actual; - arrayexpr = actual->expr; + arrayexpr = arg_array->expr; arrayss = gfc_walk_expr (arrayexpr); gcc_assert (arrayss != gfc_ss_terminator); @@ -2619,9 +2620,9 @@ gfc_conv_intrinsic_arith (gfc_se * se, gfc_expr * expr, enum tree_code op, maskexpr = NULL; else { - actual = actual->next->next; - gcc_assert (actual); - maskexpr = actual->expr; + arg_mask = arg_array->next->next; + gcc_assert (arg_mask != NULL); + maskexpr = arg_mask->expr; } if (maskexpr && maskexpr->rank > 0) |