From fd0477ca84491b35875ab913f3b607fd33cb1258 Mon Sep 17 00:00:00 2001 From: Kugan Vivekanandarajah Date: Tue, 15 Nov 2016 22:40:11 +0000 Subject: [PATCH] tree-ssa-coalesce.c (register_default_def): Remove register_ssa_partition. gcc/ChangeLog: 2016-11-16 Kugan Vivekanandarajah * tree-ssa-coalesce.c (register_default_def): Remove register_ssa_partition. (create_outofssa_var_map): Likewise. * tree-ssa-live.c (register_ssa_partition_check): Remove. * tree-ssa-live.h (register_ssa_partition): Likewise. From-SVN: r242461 --- gcc/ChangeLog | 7 +++++++ gcc/tree-ssa-coalesce.c | 15 ++------------- gcc/tree-ssa-live.c | 16 ---------------- gcc/tree-ssa-live.h | 13 ------------- 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f796e148a9c..75f7cfa9bd1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2016-11-16 Kugan Vivekanandarajah + + * tree-ssa-coalesce.c (register_default_def): Remove register_ssa_partition. + (create_outofssa_var_map): Likewise. + * tree-ssa-live.c (register_ssa_partition_check): Remove. + * tree-ssa-live.h (register_ssa_partition): Likewise. + 2016-11-15 Bernd Edlinger * genattrtab.c (attr_rtx_1): Avoid allocating new rtx objects. diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c index 6423cdd3cbb..d2574df4c0d 100644 --- a/gcc/tree-ssa-coalesce.c +++ b/gcc/tree-ssa-coalesce.c @@ -1040,17 +1040,13 @@ create_default_def (tree var, void *arg ATTRIBUTE_UNUSED) /* Register VAR's default def in MAP. */ static void -register_default_def (tree var, void *map_) +register_default_def (tree var, void *arg ATTRIBUTE_UNUSED) { - var_map map = (var_map)map_; - if (!is_gimple_reg (var)) return; tree ssa = ssa_default_def (cfun, var); gcc_assert (ssa); - - register_ssa_partition (map, ssa); } /* If VAR is an SSA_NAME associated with a PARM_DECL or a RESULT_DECL, @@ -1088,7 +1084,6 @@ create_outofssa_var_map (coalesce_list *cl, bitmap used_in_copy) gimple *stmt; tree first; var_map map; - ssa_op_iter iter; int v1, v2, cost; unsigned i; @@ -1096,7 +1091,7 @@ create_outofssa_var_map (coalesce_list *cl, bitmap used_in_copy) map = init_var_map (num_ssa_names); - for_all_parms (register_default_def, map); + for_all_parms (register_default_def, NULL); FOR_EACH_BB_FN (bb, cfun) { @@ -1114,7 +1109,6 @@ create_outofssa_var_map (coalesce_list *cl, bitmap used_in_copy) res = gimple_phi_result (phi); ver = SSA_NAME_VERSION (res); - register_ssa_partition (map, res); /* Register ssa_names and coalesces between the args and the result of all PHI. */ @@ -1125,7 +1119,6 @@ create_outofssa_var_map (coalesce_list *cl, bitmap used_in_copy) if (TREE_CODE (arg) != SSA_NAME) continue; - register_ssa_partition (map, arg); if (gimple_can_coalesce_p (arg, res) || (e->flags & EDGE_ABNORMAL)) { @@ -1152,10 +1145,6 @@ create_outofssa_var_map (coalesce_list *cl, bitmap used_in_copy) if (is_gimple_debug (stmt)) continue; - /* Register USE and DEF operands in each statement. */ - FOR_EACH_SSA_TREE_OPERAND (var, stmt, iter, (SSA_OP_DEF|SSA_OP_USE)) - register_ssa_partition (map, var); - /* Check for copy coalesces. */ switch (gimple_code (stmt)) { diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c index b9eef201ddd..9de03d14a36 100644 --- a/gcc/tree-ssa-live.c +++ b/gcc/tree-ssa-live.c @@ -1276,22 +1276,6 @@ debug (tree_live_info_d *ptr) } -/* Verify that SSA_VAR is a non-virtual SSA_NAME. */ - -void -register_ssa_partition_check (tree ssa_var) -{ - gcc_assert (TREE_CODE (ssa_var) == SSA_NAME); - if (virtual_operand_p (ssa_var)) - { - fprintf (stderr, "Illegally registering a virtual SSA name :"); - print_generic_expr (stderr, ssa_var, TDF_SLIM); - fprintf (stderr, " in the SSA->Normal phase.\n"); - internal_error ("SSA corruption"); - } -} - - /* Verify that the info in LIVE matches the current cfg. */ static void diff --git a/gcc/tree-ssa-live.h b/gcc/tree-ssa-live.h index 6df102a1666..440efa9f6be 100644 --- a/gcc/tree-ssa-live.h +++ b/gcc/tree-ssa-live.h @@ -80,7 +80,6 @@ extern void remove_unused_locals (void); extern void dump_var_map (FILE *, var_map); extern void debug (_var_map &ref); extern void debug (_var_map *ptr); -extern void register_ssa_partition_check (tree ssa_var); /* Return number of partitions in MAP. */ @@ -174,18 +173,6 @@ num_basevars (var_map map) } - -/* This routine registers a partition for SSA_VAR with MAP. Any unregistered - partitions may be filtered out by a view later. */ - -static inline void -register_ssa_partition (var_map map ATTRIBUTE_UNUSED, tree ssa_var) -{ - if (flag_checking) - register_ssa_partition_check (ssa_var); -} - - /* ---------------- live on entry/exit info ------------------------------ This structure is used to represent live range information on SSA based