aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2018-09-13 11:31:58 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2018-09-13 11:31:58 +0000
commit2aa4cc744ff8ebfaaec69edf8d21411cecc0b783 (patch)
tree489f4f979eaa64b56a4b2bdf3ced7bdccdc16209
parent67295b68372f0dd13d44556e2f48a370c5d75119 (diff)
downloadgcc-2aa4cc744ff8ebfaaec69edf8d21411cecc0b783.zip
gcc-2aa4cc744ff8ebfaaec69edf8d21411cecc0b783.tar.gz
gcc-2aa4cc744ff8ebfaaec69edf8d21411cecc0b783.tar.bz2
re PR bootstrap/87134 (SEGV in cc1 caused by r263875)
2018-09-13 Richard Biener <rguenther@suse.de> 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
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/tree-ssa-sccvn.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e62f461..6583bc0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2018-09-13 Richard Biener <rguenther@suse.de>
+
+ 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 <osandov@osandov.com>
Tom de Vries <tdevries@suse.de>
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 2a837c2..7f2562f 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);
}