diff options
| author | Richard Biener <rguenther@suse.de> | 2016-09-29 07:15:13 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2016-09-29 07:15:13 +0000 |
| commit | ca0e1607e9f7a185b9c0e29509b2ab84727d9041 (patch) | |
| tree | fa9ab167fc391898190ed762ac4ad67bdef24fbf /gcc | |
| parent | 6748787813f8080f853766877f6933bc0823c19d (diff) | |
| download | gcc-ca0e1607e9f7a185b9c0e29509b2ab84727d9041.zip gcc-ca0e1607e9f7a185b9c0e29509b2ab84727d9041.tar.gz gcc-ca0e1607e9f7a185b9c0e29509b2ab84727d9041.tar.bz2 | |
re PR bootstrap/77768 (LTO/PGO -O3 bootstrap broken: tree-vrp.c:11053:0: internal compiler error: Segmentation fault)
2016-09-29 Richard Biener <rguenther@suse.de>
PR tree-optimization/77768
* tree-ssa-sccvn.c (visit_reference_op_store): Properly deal
with stores to a place we know has a constant value.
From-SVN: r240610
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/tree-ssa-sccvn.c | 33 |
2 files changed, 22 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f2c8fe4..eac9546 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-09-29 Richard Biener <rguenther@suse.de> + + PR tree-optimization/77768 + * tree-ssa-sccvn.c (visit_reference_op_store): Properly deal + with stores to a place we know has a constant value. + 2016-09-29 Alan Modra <amodra@gmail.com> * config/rs6000/sysv4.opt (mgnu-attribute): New option. diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index 94fd66a..1653d73 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -3575,7 +3575,7 @@ visit_reference_op_store (tree lhs, tree op, gimple *stmt) { bool changed = false; vn_reference_t vnresult = NULL; - tree result, assign; + tree assign; bool resultsame = false; tree vuse = gimple_vuse (stmt); tree vdef = gimple_vdef (stmt); @@ -3599,9 +3599,11 @@ visit_reference_op_store (tree lhs, tree op, gimple *stmt) Otherwise, the vdefs for the store are used when inserting into the table, since the store generates a new memory state. */ - result = vn_reference_lookup (lhs, vuse, VN_NOWALK, &vnresult, false); - if (result) + vn_reference_lookup (lhs, vuse, VN_NOWALK, &vnresult, false); + if (vnresult + && vnresult->result) { + tree result = vnresult->result; if (TREE_CODE (result) == SSA_NAME) result = SSA_VAL (result); resultsame = expressions_equal_p (result, op); @@ -3616,22 +3618,21 @@ visit_reference_op_store (tree lhs, tree op, gimple *stmt) } } - if ((!result || !resultsame) + if (!resultsame) + { /* Only perform the following when being called from PRE which embeds tail merging. */ - && default_vn_walk_kind == VN_WALK) - { - assign = build2 (MODIFY_EXPR, TREE_TYPE (lhs), lhs, op); - vn_reference_lookup (assign, vuse, VN_NOWALK, &vnresult, false); - if (vnresult) + if (default_vn_walk_kind == VN_WALK) { - VN_INFO (vdef)->use_processed = true; - return set_ssa_val_to (vdef, vnresult->result_vdef); + assign = build2 (MODIFY_EXPR, TREE_TYPE (lhs), lhs, op); + vn_reference_lookup (assign, vuse, VN_NOWALK, &vnresult, false); + if (vnresult) + { + VN_INFO (vdef)->use_processed = true; + return set_ssa_val_to (vdef, vnresult->result_vdef); + } } - } - if (!result || !resultsame) - { if (dump_file && (dump_flags & TDF_DETAILS)) { fprintf (dump_file, "No store match\n"); @@ -3644,9 +3645,7 @@ visit_reference_op_store (tree lhs, tree op, gimple *stmt) /* Have to set value numbers before insert, since insert is going to valueize the references in-place. */ if (vdef) - { - changed |= set_ssa_val_to (vdef, vdef); - } + changed |= set_ssa_val_to (vdef, vdef); /* Do not insert structure copies into the tables. */ if (is_gimple_min_invariant (op) |