diff options
| author | Richard Biener <rguenther@suse.de> | 2016-07-15 10:53:29 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2016-07-15 10:53:29 +0000 |
| commit | a8e15f9074d70cf2b029e04f3f56ed64e5171556 (patch) | |
| tree | 2aae7d8dd4c803b42f5755515450c664ec7bc8a6 /gcc | |
| parent | ddbbcb1981b4f7c8ee18f4aecaf84c2cb2d98e2e (diff) | |
| download | gcc-a8e15f9074d70cf2b029e04f3f56ed64e5171556.zip gcc-a8e15f9074d70cf2b029e04f3f56ed64e5171556.tar.gz gcc-a8e15f9074d70cf2b029e04f3f56ed64e5171556.tar.bz2 | |
tree-ssa-pre.c (get_representative_for): Make sure to return the value number of SSA names.
2016-07-15 Richard Biener <rguenther@suse.de>
* tree-ssa-pre.c (get_representative_for): Make sure to return
the value number of SSA names.
(phi_translate_1): get_representative_for cannot return NULL.
(do_pre_regular_insertion): Remove redundant call to
fully_constant_expression.
(do_pre_partial_partial_insertion): Likewise.
From-SVN: r238370
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/tree-ssa-pre.c | 23 |
2 files changed, 15 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e9c1144..7e04fe9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2016-07-15 Richard Biener <rguenther@suse.de> + + * tree-ssa-pre.c (get_representative_for): Make sure to return + the value number of SSA names. + (phi_translate_1): get_representative_for cannot return NULL. + (do_pre_regular_insertion): Remove redundant call to + fully_constant_expression. + (do_pre_partial_partial_insertion): Likewise. + 2016-07-15 Bin Cheng <bin.cheng@arm.com> * tree-scalar-evolution.c (simple_iv_with_niters): New funcion. diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index 518346a..c45eb2e 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -1365,7 +1365,7 @@ get_representative_for (const pre_expr e) switch (e->kind) { case NAME: - return PRE_EXPR_NAME (e); + return VN_INFO (PRE_EXPR_NAME (e))->valnum; case CONSTANT: return PRE_EXPR_CONSTANT (e); case NARY: @@ -1380,7 +1380,7 @@ get_representative_for (const pre_expr e) { pre_expr rep = expression_for_id (i); if (rep->kind == NAME) - return PRE_EXPR_NAME (rep); + return VN_INFO (PRE_EXPR_NAME (rep))->valnum; else if (rep->kind == CONSTANT) return PRE_EXPR_CONSTANT (rep); } @@ -1448,12 +1448,7 @@ phi_translate_1 (pre_expr expr, bitmap_set_t set1, bitmap_set_t set2, leader = find_leader_in_sets (op_val_id, set1, set2); result = phi_translate (leader, set1, set2, pred, phiblock); if (result && result != leader) - { - tree name = get_representative_for (result); - if (!name) - return NULL; - newnary->op[i] = name; - } + newnary->op[i] = get_representative_for (result); else if (!result) return NULL; @@ -1543,19 +1538,15 @@ phi_translate_1 (pre_expr expr, bitmap_set_t set1, bitmap_set_t set2, } op_val_id = VN_INFO (op[n])->value_id; leader = find_leader_in_sets (op_val_id, set1, set2); - if (!leader) - break; opresult = phi_translate (leader, set1, set2, pred, phiblock); - if (!opresult) - break; - if (opresult != leader) + if (opresult && opresult != leader) { tree name = get_representative_for (opresult); - if (!name) - break; changed |= name != op[n]; op[n] = name; } + else if (!opresult) + break; } if (n != 3) { @@ -3198,7 +3189,6 @@ do_pre_regular_insertion (basic_block block, basic_block dom) break; } - eprime = fully_constant_expression (eprime); vprime = get_expr_value_id (eprime); edoubleprime = bitmap_find_leader (AVAIL_OUT (bprime), vprime); @@ -3357,7 +3347,6 @@ do_pre_partial_partial_insertion (basic_block block, basic_block dom) break; } - eprime = fully_constant_expression (eprime); vprime = get_expr_value_id (eprime); edoubleprime = bitmap_find_leader (AVAIL_OUT (bprime), vprime); avail[pred->dest_idx] = edoubleprime; |