From: Bill Schmidt Date: Wed, 16 Aug 2017 14:13:27 +0000 (+0000) Subject: backport: re PR tree-optimization/81354 (Segmentation fault in SSA Strength Reduction... X-Git-Tag: releases/gcc-5.5.0~118 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0db6ba4d61747d6f97e83767a5b4ce0a3971bf8;p=thirdparty%2Fgcc.git backport: re PR tree-optimization/81354 (Segmentation fault in SSA Strength Reduction using -O3) [gcc] 2017-08-16 Bill Schmidt Backport from mainline 2017-08-08 Bill Schmidt PR tree-optimization/81354 * gimple-ssa-strength-reduction.c (create_add_on_incoming_edge): Insert on edges rather than explicitly creating landing pads. (analyze_candidates_and_replace): Commit edge inserts. [gcc/testsuite] 2017-08-16 Bill Schmidt Backport from mainline 2017-08-08 Bill Schmidt PR tree-optimization/81354 * g++.dg/torture/pr81354.C: New file. From-SVN: r251122 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3b431ce83f4f..3932ee83d690 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2017-08-16 Bill Schmidt + + Backport from mainline + 2017-08-08 Bill Schmidt + + PR tree-optimization/81354 + * gimple-ssa-strength-reduction.c (create_add_on_incoming_edge): + Insert on edges rather than explicitly creating landing pads. + (analyze_candidates_and_replace): Commit edge inserts. + 2017-07-31 Jakub Jelinek PR sanitizer/81604 diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c index 77c5a0508845..8f7c56d6085a 100644 --- a/gcc/gimple-ssa-strength-reduction.c +++ b/gcc/gimple-ssa-strength-reduction.c @@ -2178,8 +2178,6 @@ create_add_on_incoming_edge (slsr_cand_t c, tree basis_name, widest_int increment, edge e, location_t loc, bool known_stride) { - basic_block insert_bb; - gimple_stmt_iterator gsi; tree lhs, basis_type; gassign *new_stmt; @@ -2234,19 +2232,13 @@ create_add_on_incoming_edge (slsr_cand_t c, tree basis_name, gcc_unreachable (); } - insert_bb = single_succ_p (e->src) ? e->src : split_edge (e); - gsi = gsi_last_bb (insert_bb); - - if (!gsi_end_p (gsi) && is_ctrl_stmt (gsi_stmt (gsi))) - gsi_insert_before (&gsi, new_stmt, GSI_NEW_STMT); - else - gsi_insert_after (&gsi, new_stmt, GSI_NEW_STMT); - gimple_set_location (new_stmt, loc); + gsi_insert_on_edge (e, new_stmt); if (dump_file && (dump_flags & TDF_DETAILS)) { - fprintf (dump_file, "Inserting in block %d: ", insert_bb->index); + fprintf (dump_file, "Inserting on edge %d->%d: ", e->src->index, + e->dest->index); print_gimple_stmt (dump_file, new_stmt, 0, 0); } @@ -3614,6 +3606,10 @@ analyze_candidates_and_replace (void) free (incr_vec); } } + + /* For conditional candidates, we may have uncommitted insertions + on edges to clean up. */ + gsi_commit_edge_inserts (); } namespace { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 26841b60fe67..f57bfb079e8c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2017-08-16 Bill Schmidt + + Backport from mainline + 2017-08-08 Bill Schmidt + + PR tree-optimization/81354 + * g++.dg/torture/pr81354.C: New file. + 2017-07-31 Jakub Jelinek PR sanitizer/81604 diff --git a/gcc/testsuite/g++.dg/torture/pr81354.C b/gcc/testsuite/g++.dg/torture/pr81354.C new file mode 100644 index 000000000000..b3ba8f093710 --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr81354.C @@ -0,0 +1,24 @@ +// PR81354 reported this test as crashing in a limited range of revisions. +// { dg-do compile } + +struct T { double a; double b; }; + +void foo(T Ad[], int As[2]) +{ + int j; + int i; + int Bs[2] = {0,0}; + T Bd[16]; + + for (j = 0; j < 4; j++) { + for (i = 0; i + 1 <= j + 1; i++) { + Ad[i + As[0] * j] = Bd[i + Bs[0] * j]; + } + + i = j + 1; // <- comment out this line and it does not crash + for (; i + 1 < 5; i++) { + Ad[i + As[0] * j].a = 0.0; + Ad[i + As[0] * j].b = 0.0; + } + } +}