diff options
| author | Jeff Law <law@redhat.com> | 2017-11-01 16:49:08 -0600 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2017-11-01 16:49:08 -0600 |
| commit | d9a3704a0bc83286afc179bc5e638ad6f7460bb3 (patch) | |
| tree | 1c17c33dc292c5cbbffe76f1b5fe6839e210688b /gcc/tree-complex.c | |
| parent | efc04f78d8a0efb66d9f767ce26aa7d01d19cb0c (diff) | |
tree-ssa-propagate.h (ssa_prop_visit_stmt_fn): Remove typedef.
* tree-ssa-propagate.h (ssa_prop_visit_stmt_fn): Remove typedef.
(ssa_prop_visit_phi_fn): Likewise.
(class ssa_propagation_engine): New class to provide an interface
into ssa_propagate.
* tree-ssa-propagate.c (ssa_prop_visit_stmt): Remove file scoped
variable.
(ssa_prop_visit_phi): Likewise.
(ssa_propagation_engine::simulate_stmt): Moved into class.
Call visit_phi/visit_stmt from the class rather than via
file scoped static variables.
(ssa_propagation_engine::simulate_block): Moved into class.
(ssa_propagation_engine::process_ssa_edge_worklist): Similarly.
(ssa_propagation_engine::ssa_propagate): Similarly. No longer
set file scoped statics for the visit_stmt/visit_phi callbacks.
* tree-complex.c (complex_propagate): New class derived from
ssa_propagation_engine.
(complex_propagate::visit_stmt): Renamed from complex_visit_stmt.
(complex_propagate::visit_phi): Renamed from complex_visit_phi.
(tree_lower_complex): Call ssa_propagate via the complex_propagate
class.
* tree-ssa-ccp.c: (ccp_propagate): New class derived from
ssa_propagation_engine.
(ccp_propagate::visit_phi): Renamed from ccp_visit_phi_node.
(ccp_propagate::visit_stmt): Renamed from ccp_visit_stmt.
(do_ssa_ccp): Call ssa_propagate from the ccp_propagate class.
* tree-ssa-copy.c (copy_prop): New class derived from
ssa_propagation_engine.
(copy_prop::visit_stmt): Renamed from copy_prop_visit_stmt.
(copy_prop::visit_phi): Renamed from copy_prop_visit_phi_node.
(execute_copy_prop): Call ssa_propagate from the copy_prop class.
* tree-vrp.c (vrp_prop): New class derived from ssa_propagation_engine.
(vrp_prop::visit_stmt): Renamed from vrp_visit_stmt.
(vrp_prop::visit_phi): Renamed from vrp_visit_phi_node.
(execute_vrp): Call ssa_propagate from the vrp_prop class.
From-SVN: r254329
Diffstat (limited to 'gcc/tree-complex.c')
| -rw-r--r-- | gcc/tree-complex.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c index e2d93b78eae..e9e7e2ad92f 100644 --- a/gcc/tree-complex.c +++ b/gcc/tree-complex.c @@ -60,6 +60,11 @@ typedef int complex_lattice_t; #define PAIR(a, b) ((a) << 2 | (b)) +class complex_propagate : public ssa_propagation_engine +{ + enum ssa_prop_result visit_stmt (gimple *, edge *, tree *) FINAL OVERRIDE; + enum ssa_prop_result visit_phi (gphi *) FINAL OVERRIDE; +}; static vec<complex_lattice_t> complex_lattice_values; @@ -300,9 +305,9 @@ init_dont_simulate_again (void) /* Evaluate statement STMT against the complex lattice defined above. */ -static enum ssa_prop_result -complex_visit_stmt (gimple *stmt, edge *taken_edge_p ATTRIBUTE_UNUSED, - tree *result_p) +enum ssa_prop_result +complex_propagate::visit_stmt (gimple *stmt, edge *taken_edge_p ATTRIBUTE_UNUSED, + tree *result_p) { complex_lattice_t new_l, old_l, op1_l, op2_l; unsigned int ver; @@ -395,8 +400,8 @@ complex_visit_stmt (gimple *stmt, edge *taken_edge_p ATTRIBUTE_UNUSED, /* Evaluate a PHI node against the complex lattice defined above. */ -static enum ssa_prop_result -complex_visit_phi (gphi *phi) +enum ssa_prop_result +complex_propagate::visit_phi (gphi *phi) { complex_lattice_t new_l, old_l; unsigned int ver; @@ -1673,7 +1678,8 @@ tree_lower_complex (void) complex_lattice_values.safe_grow_cleared (num_ssa_names); init_parameter_lattice_values (); - ssa_propagate (complex_visit_stmt, complex_visit_phi); + class complex_propagate complex_propagate; + complex_propagate.ssa_propagate (); complex_variable_components = new int_tree_htab_type (10); |