From 1f32c54e3a685e69015abadf5d64d668226f3871 Mon Sep 17 00:00:00 2001 From: aldyh Date: Thu, 11 Dec 2014 19:13:57 +0000 Subject: [PATCH] * dwarf2out.c (gen_lexical_block_die): Remove unused `depth' parameter. (gen_inlined_subroutine_die): Same. (gen_block_die): Same. (decls_for_scope): Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218639 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/dwarf2out.c | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6579504a559..7f233e8626e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-12-11 Aldy Hernandez + + * dwarf2out.c (gen_lexical_block_die): Remove unused `depth' + parameter. + (gen_inlined_subroutine_die): Same. + (gen_block_die): Same. + (decls_for_scope): Same. + 2014-12-11 Renlin Li * config/aarch64/aarch64-cores.def: Change all AARCH64_FL_FPSIMD to diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 34b327e7514..4c2ff8dd03b 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -3263,8 +3263,8 @@ static void gen_subprogram_die (tree, dw_die_ref); static void gen_variable_die (tree, tree, dw_die_ref); static void gen_const_die (tree, dw_die_ref); static void gen_label_die (tree, dw_die_ref); -static void gen_lexical_block_die (tree, dw_die_ref, int); -static void gen_inlined_subroutine_die (tree, dw_die_ref, int); +static void gen_lexical_block_die (tree, dw_die_ref); +static void gen_inlined_subroutine_die (tree, dw_die_ref); static void gen_field_die (tree, dw_die_ref); static void gen_ptr_to_mbr_type_die (tree, dw_die_ref); static dw_die_ref gen_compile_unit_die (const char *); @@ -3275,8 +3275,8 @@ static void gen_struct_or_union_type_die (tree, dw_die_ref, static void gen_subroutine_type_die (tree, dw_die_ref); static void gen_typedef_die (tree, dw_die_ref); static void gen_type_die (tree, dw_die_ref); -static void gen_block_die (tree, dw_die_ref, int); -static void decls_for_scope (tree, dw_die_ref, int); +static void gen_block_die (tree, dw_die_ref); +static void decls_for_scope (tree, dw_die_ref); static inline int is_redundant_typedef (const_tree); static bool is_naming_typedef_decl (const_tree); static inline dw_die_ref get_context_die (tree); @@ -18696,7 +18696,7 @@ gen_subprogram_die (tree decl, dw_die_ref context_die) if (DECL_NAME (DECL_RESULT (decl))) gen_decl_die (DECL_RESULT (decl), NULL, subr_die); - decls_for_scope (outer_scope, subr_die, 0); + decls_for_scope (outer_scope, subr_die); if (call_arg_locations && !dwarf_strict) { @@ -19294,7 +19294,7 @@ add_high_low_attributes (tree stmt, dw_die_ref die) /* Generate a DIE for a lexical block. */ static void -gen_lexical_block_die (tree stmt, dw_die_ref context_die, int depth) +gen_lexical_block_die (tree stmt, dw_die_ref context_die) { dw_die_ref stmt_die = new_die (DW_TAG_lexical_block, context_die, stmt); @@ -19308,13 +19308,13 @@ gen_lexical_block_die (tree stmt, dw_die_ref context_die, int depth) if (! BLOCK_ABSTRACT (stmt) && TREE_ASM_WRITTEN (stmt)) add_high_low_attributes (stmt, stmt_die); - decls_for_scope (stmt, stmt_die, depth); + decls_for_scope (stmt, stmt_die); } /* Generate a DIE for an inlined subprogram. */ static void -gen_inlined_subroutine_die (tree stmt, dw_die_ref context_die, int depth) +gen_inlined_subroutine_die (tree stmt, dw_die_ref context_die) { tree decl; @@ -19346,7 +19346,7 @@ gen_inlined_subroutine_die (tree stmt, dw_die_ref context_die, int depth) add_high_low_attributes (stmt, subr_die); add_call_src_coords_attributes (stmt, subr_die); - decls_for_scope (stmt, subr_die, depth); + decls_for_scope (stmt, subr_die); } } @@ -20240,7 +20240,7 @@ gen_type_die (tree type, dw_die_ref context_die) things which are local to the given block. */ static void -gen_block_die (tree stmt, dw_die_ref context_die, int depth) +gen_block_die (tree stmt, dw_die_ref context_die) { int must_output_die = 0; bool inlined_func; @@ -20259,7 +20259,7 @@ gen_block_die (tree stmt, dw_die_ref context_die, int depth) tree sub; for (sub = BLOCK_SUBBLOCKS (stmt); sub; sub = BLOCK_CHAIN (sub)) - gen_block_die (sub, context_die, depth + 1); + gen_block_die (sub, context_die); return; } @@ -20314,13 +20314,13 @@ gen_block_die (tree stmt, dw_die_ref context_die, int depth) the concrete instance of STMT got inlined, the later will lead to the generation of a DW_TAG_inlined_subroutine DIE. */ if (! BLOCK_ABSTRACT (stmt)) - gen_inlined_subroutine_die (stmt, context_die, depth); + gen_inlined_subroutine_die (stmt, context_die); } else - gen_lexical_block_die (stmt, context_die, depth); + gen_lexical_block_die (stmt, context_die); } else - decls_for_scope (stmt, context_die, depth); + decls_for_scope (stmt, context_die); } /* Process variable DECL (or variable with origin ORIGIN) within @@ -20352,7 +20352,7 @@ process_scope_var (tree stmt, tree decl, tree origin, dw_die_ref context_die) all of its sub-blocks. */ static void -decls_for_scope (tree stmt, dw_die_ref context_die, int depth) +decls_for_scope (tree stmt, dw_die_ref context_die) { tree decl; unsigned int i; @@ -20384,7 +20384,7 @@ decls_for_scope (tree stmt, dw_die_ref context_die, int depth) for (subblocks = BLOCK_SUBBLOCKS (stmt); subblocks != NULL; subblocks = BLOCK_CHAIN (subblocks)) - gen_block_die (subblocks, context_die, depth + 1); + gen_block_die (subblocks, context_die); } /* Is this a typedef we can avoid emitting? */ -- 2.11.4.GIT