From 2aa4cc744ff8ebfaaec69edf8d21411cecc0b783 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 13 Sep 2018 11:31:58 +0000 Subject: [PATCH] re PR bootstrap/87134 (SEGV in cc1 caused by r263875) 2018-09-13 Richard Biener PR bootstrap/87134 * tree-ssa-sccvn.c (vn_nary_op_insert_into): Fix assert. (vn_nary_op_insert_pieces_predicated): Do not write useless valid_dominated_by_p entry outside of the allocated storage. From-SVN: r264268 --- gcc/ChangeLog | 7 +++++++ gcc/tree-ssa-sccvn.c | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e62f461df84..6583bc01220 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-09-13 Richard Biener + + PR bootstrap/87134 + * tree-ssa-sccvn.c (vn_nary_op_insert_into): Fix assert. + (vn_nary_op_insert_pieces_predicated): Do not write useless + valid_dominated_by_p entry outside of the allocated storage. + 2018-09-13 Omar Sandoval Tom de Vries diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index 2a837c26821..7f2562fb4d3 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -3036,8 +3036,7 @@ vn_nary_op_insert_into (vn_nary_op_t vno, vn_nary_op_table_type *table, vno->hashcode = vn_nary_op_compute_hash (vno); gcc_assert (! vno->predicated_values || (! vno->u.values->next - && vno->u.values->valid_dominated_by_p[0] != EXIT_BLOCK - && vno->u.values->valid_dominated_by_p[1] == EXIT_BLOCK)); + && vno->u.values->n == 1)); } slot = table->find_slot_with_hash (vno, vno->hashcode, INSERT); @@ -3216,7 +3215,6 @@ vn_nary_op_insert_pieces_predicated (unsigned int length, enum tree_code code, vno1->u.values->result = result; vno1->u.values->n = 1; vno1->u.values->valid_dominated_by_p[0] = pred_e->dest->index; - vno1->u.values->valid_dominated_by_p[1] = EXIT_BLOCK; return vn_nary_op_insert_into (vno1, valid_info->nary, true); } -- 2.30.2