diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-25 19:43:17 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-25 19:43:17 +0000 |
| commit | 24abc2420277698b9a806772e9668ae33bdbb732 (patch) | |
| tree | 5a1608a403a3496a2ce59aeb60b3121fb3b904a9 | |
| parent | c985611c7efa88979e6452a93e36e1234518ee29 (diff) | |
svn merge -r150068:150069 svn+ssh://gcc.gnu.org/svn/gcc/trunk
svn merge -r150040:150041 svn+ssh://gcc.gnu.org/svn/gcc/trunk
svn merge -r150020:150021 svn+ssh://gcc.gnu.org/svn/gcc/trunk
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_4-branch@150088 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/trans-intrinsic.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index fdc14ae9d6e..7e999cb3bb5 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -2366,8 +2366,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, int op) ifbody2 = gfc_finish_block (&ifblock2); cond = fold_build2 (EQ_EXPR, boolean_type_node, pos, gfc_index_zero_node); - tmp = build3_v (COND_EXPR, cond, ifbody2, - build_empty_stmt (input_location)); + tmp = build3_v (COND_EXPR, cond, ifbody2, build_empty_stmt ()); gfc_add_expr_to_block (&block, tmp); } @@ -2388,8 +2387,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, int op) else cond = fold_build2 (op, boolean_type_node, arrayse.expr, limit); - ifbody = build3_v (COND_EXPR, cond, ifbody, - build_empty_stmt (input_location)); + ifbody = build3_v (COND_EXPR, cond, ifbody, build_empty_stmt ()); } gfc_add_expr_to_block (&block, ifbody); @@ -2398,8 +2396,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, int op) /* We enclose the above in if (mask) {...}. */ tmp = gfc_finish_block (&block); - tmp = build3_v (COND_EXPR, maskse.expr, tmp, - build_empty_stmt (input_location)); + tmp = build3_v (COND_EXPR, maskse.expr, tmp, build_empty_stmt ()); } else tmp = gfc_finish_block (&block); @@ -2414,8 +2411,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, int op) if (nonempty != NULL) { ifbody = build2_v (MODIFY_EXPR, pos, gfc_index_one_node); - tmp = build3_v (COND_EXPR, nonempty, ifbody, - build_empty_stmt (input_location)); + tmp = build3_v (COND_EXPR, nonempty, ifbody, build_empty_stmt ()); gfc_add_expr_to_block (&loop.code[0], tmp); } } @@ -2469,8 +2465,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, int op) cond = fold_build2 (op, boolean_type_node, arrayse.expr, limit); - tmp = build3_v (COND_EXPR, cond, ifbody, - build_empty_stmt (input_location)); + tmp = build3_v (COND_EXPR, cond, ifbody, build_empty_stmt ()); gfc_add_expr_to_block (&block, tmp); if (maskss) @@ -2478,8 +2473,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, int op) /* We enclose the above in if (mask) {...}. */ tmp = gfc_finish_block (&block); - tmp = build3_v (COND_EXPR, maskse.expr, tmp, - build_empty_stmt (input_location)); + tmp = build3_v (COND_EXPR, maskse.expr, tmp, build_empty_stmt ()); } else tmp = gfc_finish_block (&block); |