diff options
| author | Andrew MacLeod <amacleod@redhat.com> | 2013-11-05 14:13:56 +0000 |
|---|---|---|
| committer | Andrew Macleod <amacleod@gcc.gnu.org> | 2013-11-05 14:13:56 +0000 |
| commit | c8d97db2cc5f8c8b603196e1f3704b4a2c3caf37 (patch) | |
| tree | fa68845ee02d5d3d6eeca638d0ed925c3481f017 /gcc/tree-outof-ssa.c | |
| parent | ecbffdd88f3f073ded32f1cd632dfb1bfc5d7c38 (diff) | |
| download | gcc-c8d97db2cc5f8c8b603196e1f3704b4a2c3caf37.zip gcc-c8d97db2cc5f8c8b603196e1f3704b4a2c3caf37.tar.gz gcc-c8d97db2cc5f8c8b603196e1f3704b4a2c3caf37.tar.bz2 | |
tree-outof-ssa.c (queue_phi_copy_p): Combine phi_ssa_name_p from gimple.h and the rest of the condition in...
2013-11-05 Andrew MacLeod <amacleod@redhat.com>
* tree-outof-ssa.c (queue_phi_copy_p): Combine phi_ssa_name_p from
gimple.h and the rest of the condition in eliminate_build.
(eliminate_build): Call new routine.
* gimple.h (phi_ssa_name_p): Delete.
From-SVN: r204393
Diffstat (limited to 'gcc/tree-outof-ssa.c')
| -rw-r--r-- | gcc/tree-outof-ssa.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c index 1e98285..4dc3f9e 100644 --- a/gcc/tree-outof-ssa.c +++ b/gcc/tree-outof-ssa.c @@ -548,6 +548,23 @@ eliminate_name (elim_graph g, int T) elim_graph_add_node (g, T); } +/* Return true if this phi argument T should have a copy queued when using + var_map MAP. PHI nodes should contain only ssa_names and invariants. A + test for ssa_name is definitely simpler, but don't let invalid contents + slip through in the meantime. */ + +static inline bool +queue_phi_copy_p (var_map map, tree t) +{ + if (TREE_CODE (t) == SSA_NAME) + { + if (var_to_partition (map, t) == NO_PARTITION) + return true; + return false; + } + gcc_checking_assert (is_gimple_min_invariant (t)); + return true; +} /* Build elimination graph G for basic block BB on incoming PHI edge G->e. */ @@ -577,9 +594,7 @@ eliminate_build (elim_graph g) /* If this argument is a constant, or a SSA_NAME which is being left in SSA form, just queue a copy to be emitted on this edge. */ - if (!phi_ssa_name_p (Ti) - || (TREE_CODE (Ti) == SSA_NAME - && var_to_partition (g->map, Ti) == NO_PARTITION)) + if (queue_phi_copy_p (g->map, Ti)) { /* Save constant copies until all other copies have been emitted on this edge. */ |