From 23125fab7b16f1aa61dfec69092786dc6d215732 Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Tue, 16 Nov 2021 10:44:54 +0100 Subject: [PATCH] Replace more DEBUG_EXPR_DECL creations with build_debug_expr_decl As discussed on the mailing list, this patch replaces all but one remaining open coded constructions of DEBUG_EXPR_DECL with calls to build_debug_expr_decl, even if - in order not to introduce any functional change - the mode of the constructed decl is then overwritten. It is not clear if changing the mode has any effect in practice and therefore I have added a FIXME note to code which does it, as requested. After this patch, DEBUG_EXPR_DECLs are created only by build_debug_expr_decl and make_debug_expr_from_rtl which looks like it should be left alone. gcc/ChangeLog: 2021-11-11 Martin Jambor * cfgexpand.c (expand_gimple_basic_block): Use build_debug_expr_decl, add a fixme note about the mode assignment perhaps being unnecessary. * ipa-param-manipulation.c (ipa_param_adjustments::modify_call): Likewise. (ipa_param_body_adjustments::mark_dead_statements): Likewise. (ipa_param_body_adjustments::reset_debug_stmts): Likewise. * tree-inline.c (remap_ssa_name): Likewise. (tree_function_versioning): Likewise. * tree-into-ssa.c (rewrite_debug_stmt_uses): Likewise. * tree-ssa-loop-ivopts.c (remove_unused_ivs): Likewise. * tree-ssa.c (insert_debug_temp_for_var_def): Likewise. --- gcc/cfgexpand.c | 5 ++--- gcc/ipa-param-manipulation.c | 17 +++++++---------- gcc/tree-inline.c | 17 +++++++---------- gcc/tree-into-ssa.c | 7 +++---- gcc/tree-ssa-loop-ivopts.c | 5 ++--- gcc/tree-ssa.c | 5 ++--- 6 files changed, 23 insertions(+), 33 deletions(-) diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 55ff75b..eb6466f 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -5898,18 +5898,17 @@ expand_gimple_basic_block (basic_block bb, bool disable_tail_calls) temporary. */ gimple *debugstmt; tree value = gimple_assign_rhs_to_tree (def); - tree vexpr = make_node (DEBUG_EXPR_DECL); + tree vexpr = build_debug_expr_decl (TREE_TYPE (value)); rtx val; machine_mode mode; set_curr_insn_location (gimple_location (def)); - DECL_ARTIFICIAL (vexpr) = 1; - TREE_TYPE (vexpr) = TREE_TYPE (value); if (DECL_P (value)) mode = DECL_MODE (value); else mode = TYPE_MODE (TREE_TYPE (value)); + /* FIXME: Is setting the mode really necessary? */ SET_DECL_MODE (vexpr, mode); val = gen_rtx_VAR_LOCATION diff --git a/gcc/ipa-param-manipulation.c b/gcc/ipa-param-manipulation.c index 0a5ed85..cec1dba 100644 --- a/gcc/ipa-param-manipulation.c +++ b/gcc/ipa-param-manipulation.c @@ -888,9 +888,8 @@ ipa_param_adjustments::modify_call (cgraph_edge *cs, } if (ddecl == NULL) { - ddecl = make_node (DEBUG_EXPR_DECL); - DECL_ARTIFICIAL (ddecl) = 1; - TREE_TYPE (ddecl) = TREE_TYPE (origin); + ddecl = build_debug_expr_decl (TREE_TYPE (origin)); + /* FIXME: Is setting the mode really necessary? */ SET_DECL_MODE (ddecl, DECL_MODE (origin)); vec_safe_push (*debug_args, origin); @@ -1120,9 +1119,8 @@ ipa_param_body_adjustments::mark_dead_statements (tree dead_param, return; } - tree dp_ddecl = make_node (DEBUG_EXPR_DECL); - DECL_ARTIFICIAL (dp_ddecl) = 1; - TREE_TYPE (dp_ddecl) = TREE_TYPE (dead_param); + tree dp_ddecl = build_debug_expr_decl (TREE_TYPE (dead_param)); + /* FIXME: Is setting the mode really necessary? */ SET_DECL_MODE (dp_ddecl, DECL_MODE (dead_param)); m_dead_ssa_debug_equiv.put (parm_ddef, dp_ddecl); } @@ -2285,11 +2283,10 @@ ipa_param_body_adjustments::reset_debug_stmts () gcc_assert (is_gimple_debug (stmt)); if (vexpr == NULL && gsip != NULL) { - vexpr = make_node (DEBUG_EXPR_DECL); - def_temp = gimple_build_debug_source_bind (vexpr, decl, NULL); - DECL_ARTIFICIAL (vexpr) = 1; - TREE_TYPE (vexpr) = TREE_TYPE (name); + vexpr = build_debug_expr_decl (TREE_TYPE (name)); + /* FIXME: Is setting the mode really necessary? */ SET_DECL_MODE (vexpr, DECL_MODE (decl)); + def_temp = gimple_build_debug_source_bind (vexpr, decl, NULL); gsi_insert_before (gsip, def_temp, GSI_SAME_STMT); } if (vexpr) diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 53d664e..8c108d8 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -193,7 +193,6 @@ remap_ssa_name (tree name, copy_body_data *id) && id->entry_bb == NULL && single_succ_p (ENTRY_BLOCK_PTR_FOR_FN (cfun))) { - tree vexpr = make_node (DEBUG_EXPR_DECL); gimple *def_temp; gimple_stmt_iterator gsi; tree val = SSA_NAME_VAR (name); @@ -210,10 +209,10 @@ remap_ssa_name (tree name, copy_body_data *id) n = id->decl_map->get (val); if (n && TREE_CODE (*n) == DEBUG_EXPR_DECL) return *n; - def_temp = gimple_build_debug_source_bind (vexpr, val, NULL); - DECL_ARTIFICIAL (vexpr) = 1; - TREE_TYPE (vexpr) = TREE_TYPE (name); + tree vexpr = build_debug_expr_decl (TREE_TYPE (name)); + /* FIXME: Is setting the mode really necessary? */ SET_DECL_MODE (vexpr, DECL_MODE (SSA_NAME_VAR (name))); + def_temp = gimple_build_debug_source_bind (vexpr, val, NULL); gsi = gsi_after_labels (single_succ (ENTRY_BLOCK_PTR_FOR_FN (cfun))); gsi_insert_before (&gsi, def_temp, GSI_SAME_STMT); insert_decl_map (id, val, vexpr); @@ -6450,9 +6449,8 @@ tree_function_versioning (tree old_decl, tree new_decl, debug_args = decl_debug_args_insert (new_decl); len = vec_safe_length (*debug_args); } - ddecl = make_node (DEBUG_EXPR_DECL); - DECL_ARTIFICIAL (ddecl) = 1; - TREE_TYPE (ddecl) = TREE_TYPE (parm); + ddecl = build_debug_expr_decl (TREE_TYPE (parm)); + /* FIXME: Is setting the mode really necessary? */ SET_DECL_MODE (ddecl, DECL_MODE (parm)); vec_safe_push (*debug_args, DECL_ORIGIN (parm)); vec_safe_push (*debug_args, ddecl); @@ -6488,9 +6486,8 @@ tree_function_versioning (tree old_decl, tree new_decl, vexpr = *d; if (!vexpr) { - vexpr = make_node (DEBUG_EXPR_DECL); - DECL_ARTIFICIAL (vexpr) = 1; - TREE_TYPE (vexpr) = TREE_TYPE (parm); + vexpr = build_debug_expr_decl (TREE_TYPE (parm)); + /* FIXME: Is setting the mode really necessary? */ SET_DECL_MODE (vexpr, DECL_MODE (parm)); } def_temp = gimple_build_debug_bind (var, vexpr, NULL); diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c index 8045e34..265dcc5 100644 --- a/gcc/tree-into-ssa.c +++ b/gcc/tree-into-ssa.c @@ -1284,11 +1284,10 @@ rewrite_debug_stmt_uses (gimple *stmt) if (def == NULL_TREE) { gimple *def_temp; - def = make_node (DEBUG_EXPR_DECL); - def_temp = gimple_build_debug_source_bind (def, var, NULL); - DECL_ARTIFICIAL (def) = 1; - TREE_TYPE (def) = TREE_TYPE (var); + def = build_debug_expr_decl (TREE_TYPE (var)); + /* FIXME: Is setting the mode really necessary? */ SET_DECL_MODE (def, DECL_MODE (var)); + def_temp = gimple_build_debug_source_bind (def, var, NULL); gsi = gsi_after_labels (single_succ (ENTRY_BLOCK_PTR_FOR_FN (cfun))); gsi_insert_before (&gsi, def_temp, GSI_SAME_STMT); diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c index 4a498ab..5a7fd30 100644 --- a/gcc/tree-ssa-loop-ivopts.c +++ b/gcc/tree-ssa-loop-ivopts.c @@ -7742,9 +7742,8 @@ remove_unused_ivs (struct ivopts_data *data, bitmap toremove) comp = unshare_expr (comp); if (count > 1) { - tree vexpr = make_node (DEBUG_EXPR_DECL); - DECL_ARTIFICIAL (vexpr) = 1; - TREE_TYPE (vexpr) = TREE_TYPE (comp); + tree vexpr = build_debug_expr_decl (TREE_TYPE (comp)); + /* FIXME: Is setting the mode really necessary? */ if (SSA_NAME_VAR (def)) SET_DECL_MODE (vexpr, DECL_MODE (SSA_NAME_VAR (def))); else diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c index 3f25d65..1565e21 100644 --- a/gcc/tree-ssa.c +++ b/gcc/tree-ssa.c @@ -434,14 +434,13 @@ insert_debug_temp_for_var_def (gimple_stmt_iterator *gsi, tree var) else { gdebug *def_temp; - tree vexpr = make_node (DEBUG_EXPR_DECL); + tree vexpr = build_debug_expr_decl (TREE_TYPE (value)); def_temp = gimple_build_debug_bind (vexpr, unshare_expr (value), def_stmt); - DECL_ARTIFICIAL (vexpr) = 1; - TREE_TYPE (vexpr) = TREE_TYPE (value); + /* FIXME: Is setting the mode really necessary? */ if (DECL_P (value)) SET_DECL_MODE (vexpr, DECL_MODE (value)); else -- 2.7.4