From bc4b3d2dfd47df4967669fbdf0851e49c51448d7 Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Fri, 4 Nov 2011 00:19:11 +0000 Subject: [PATCH] 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 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/trans-intrinsic.c | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index be67d8d0032c..4d78f77b431e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2011-11-04 Mikael Morin + + * trans-intrinsic.c (gfc_conv_intrinsic_arith): Small argument handling + cleanup. + 2011-11-04 Mikael Morin * trans-intrinsic.c (gfc_conv_intrinsic_arith): Update conditions. diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 342d2cb4ec40..b70150228cd3 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) -- 2.47.2