From fe78aa0474d9469384951dbddcd5aeea5f40c03c Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Wed, 2 Dec 2015 07:26:30 +0000 Subject: [PATCH] [PR68603] Associate conditional C++ loop's back-jump with start, not body SVN commit r230979 always associates a loop's back-jump with the start of the loop body. This caused a regression for gcov with conditional loops, because then the loop body appears to be covered twice per iteration. 2015-12-02 Andreas Arnez PR gcov-profile/68603 * cp-gimplify.c (genericize_cp_loop): For the back-jump's location use the start of the loop body only if the loop is unconditional. From-SVN: r231146 --- gcc/cp/ChangeLog | 11 +++++++++++ gcc/cp/cp-gimplify.c | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9cc0a53144e..385ba635c4b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,14 @@ +2015-12-02 Andreas Arnez + + PR gcov-profile/68603 + * cp-gimplify.c (genericize_cp_loop): For the back-jump's location + use the start of the loop body only if the loop is unconditional. + +2015-11-26 Andreas Arnez + + * cp-gimplify.c (genericize_cp_loop): Change LOOP_EXPR's location + to start of loop body instead of start of loop. + 2015-12-01 Julian Brown Cesar Philippidis James Norris diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index a9a34cd81cc..3c89f1b05d0 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -264,7 +264,9 @@ genericize_cp_loop (tree *stmt_p, location_t start_locus, tree cond, tree body, } else { - location_t loc = EXPR_LOCATION (expr_first (body)); + location_t loc = start_locus; + if (!cond || integer_nonzerop (cond)) + loc = EXPR_LOCATION (expr_first (body)); if (loc == UNKNOWN_LOCATION) loc = start_locus; loop = build1_loc (loc, LOOP_EXPR, void_type_node, stmt_list); -- 2.30.2