From 6931b3b79d8fac15931a16d09150543af2a832d3 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 17 Mar 2016 13:43:01 +0000 Subject: [PATCH] re PR debug/70271 (internal compiler error: in dwarf2out_finish, at dwarf2out.c:27346) 2016-03-17 Richard Biener PR debug/70271 * dwarf2out.c (dwarf2out_early_finish): Process deferred_asm_name last. * g++.dg/debug/pr70271.C: New testcase. From-SVN: r234289 --- gcc/ChangeLog | 6 +++++ gcc/dwarf2out.c | 16 ++++++------- gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/g++.dg/debug/pr70271.C | 36 ++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 gcc/testsuite/g++.dg/debug/pr70271.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3edfba0b110..a573275d97a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-03-17 Richard Biener + + PR debug/70271 + * dwarf2out.c (dwarf2out_early_finish): Process deferred_asm_name + last. + 2016-03-17 Jakub Jelinek PR target/70245 diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 61bf267d6ec..0bbff87a95e 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -27686,10 +27686,15 @@ dwarf2out_finish (const char *filename) static void dwarf2out_early_finish (void) { - limbo_die_node *node; + /* The point here is to flush out the limbo list so that it is empty + and we don't need to stream it for LTO. */ + flush_limbo_die_list (); + + gen_scheduled_generic_parms_dies (); + gen_remaining_tmpl_value_param_die_attribute (); /* Add DW_AT_linkage_name for all deferred DIEs. */ - for (node = deferred_asm_name; node; node = node->next) + for (limbo_die_node *node = deferred_asm_name; node; node = node->next) { tree decl = node->created_for; if (DECL_ASSEMBLER_NAME (decl) != DECL_NAME (decl) @@ -27703,13 +27708,6 @@ dwarf2out_early_finish (void) } } deferred_asm_name = NULL; - - /* The point here is to flush out the limbo list so that it is empty - and we don't need to stream it for LTO. */ - flush_limbo_die_list (); - - gen_scheduled_generic_parms_dies (); - gen_remaining_tmpl_value_param_die_attribute (); } /* Reset all state within dwarf2out.c so that we can rerun the compiler diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d305b0f5900..b0bdc245e67 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-03-17 Richard Biener + + PR debug/70271 + * g++.dg/debug/pr70271.C: New testcase. + 2016-03-17 Ilya Enkovich * gcc.target/i386/pr70251.c: New test. diff --git a/gcc/testsuite/g++.dg/debug/pr70271.C b/gcc/testsuite/g++.dg/debug/pr70271.C new file mode 100644 index 00000000000..3c96d3a49e9 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/pr70271.C @@ -0,0 +1,36 @@ +// { dg-do compile } + +template +struct function_traits +: public function_traits +{ }; + +template +struct function_traits +{ + typedef ReturnType (*pointer)(Args...); + typedef ReturnType return_type; +}; + +template +typename function_traits::pointer +FunctionPointer (const Function& lambda) +{ + return static_cast::pointer>(lambda); +} + +template +typename function_traits::return_type +GetReturnValue (Function func) +{ + typename function_traits::return_type *dummy; + return *dummy; +} +template class ClassFoo {}; +template void FuncBar () { } + +template <> inline void FuncBar () +{ + typedef void (*func_type)(ClassFoo &); + func_type f1 = FunctionPointer ([](ClassFoo & ref) { }); +} -- 2.30.2