From c582aac943fe2574a03cb5f557a3ee1e5d6585f1 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sat, 1 Mar 2014 21:14:00 +0000 Subject: method.c (implicitly_declare_fn): Remove redundant DECL_TEMPLATE_RESULT and STRIP_TEMPLATE uses. /cp 2014-03-01 Paolo Carlini * method.c (implicitly_declare_fn): Remove redundant DECL_TEMPLATE_RESULT and STRIP_TEMPLATE uses. * semantics.c (is_instantiation_of_constexpr): Likewise. * error.c (dump_function_decl): Likewise. 2014-03-01 Paolo Carlini * dwarf2out.c (gen_subprogram_die): Tidy. From-SVN: r208248 --- gcc/dwarf2out.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gcc/dwarf2out.c') diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 1c3ff03..2b584a5 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -18028,11 +18028,13 @@ gen_subprogram_die (tree decl, dw_die_ref context_die) /* If the prototype had an 'auto' or 'decltype(auto)' return type, emit the real type on the definition die. */ - if (is_cxx() && debug_info_level > DINFO_LEVEL_TERSE - && (get_AT_ref (old_die, DW_AT_type) == auto_die - || get_AT_ref (old_die, DW_AT_type) == decltype_auto_die)) - add_type_attribute (subr_die, TREE_TYPE (TREE_TYPE (decl)), - 0, 0, context_die); + if (is_cxx() && debug_info_level > DINFO_LEVEL_TERSE) + { + dw_die_ref die = get_AT_ref (old_die, DW_AT_type); + if (die == auto_die || die == decltype_auto_die) + add_type_attribute (subr_die, TREE_TYPE (TREE_TYPE (decl)), + 0, 0, context_die); + } } } else -- cgit v1.1