From fec64afc1aa77fe557679041a396f2c03fd8d4be Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 7 Jan 2016 09:47:44 +0100 Subject: [PATCH] re PR tree-optimization/69141 (-O2 -fdump-tree-fre ICEs) PR tree-optimization/69141 * tree-ssa-pre.c: Include langhooks.h. (eliminate_dom_walker::before_dom_children): Use lang_hooks.decl_printable_name instead of cgraph_node::get ()->name (). * g++.dg/opt/pr69141.C: New test. From-SVN: r232123 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/opt/pr69141.C | 15 +++++++++++++++ gcc/tree-ssa-pre.c | 3 ++- 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/opt/pr69141.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b690c97fc25d..8cd70fc69871 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2016-01-07 Jakub Jelinek + PR tree-optimization/69141 + * tree-ssa-pre.c: Include langhooks.h. + (eliminate_dom_walker::before_dom_children): Use + lang_hooks.decl_printable_name instead of + cgraph_node::get ()->name (). + PR middle-end/68960 * gimple-expr.c (copy_var_decl): If var has DECL_USER_ALIGN set, copy it and DECL_ALIGN too. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 538268e973c7..e21b7188c4fd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-01-07 Jakub Jelinek + + PR tree-optimization/69141 + * g++.dg/opt/pr69141.C: New test. + 2016-01-06 Eric Botcazou * gcc.target/sparc/20151219-1.c: Skip in 64-bit mode. diff --git a/gcc/testsuite/g++.dg/opt/pr69141.C b/gcc/testsuite/g++.dg/opt/pr69141.C new file mode 100644 index 000000000000..34b211c969ab --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/pr69141.C @@ -0,0 +1,15 @@ +// PR tree-optimization/69141 +// { dg-do compile } +// { dg-options "-O2 -fdump-tree-fre" } + +struct B +{ + B *b; + B (); + virtual void f () = 0; +}; + +B::B () : b (this) +{ + b->f (); +} diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index eeaecdd46d07..1f1b0559d08b 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -52,6 +52,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-ssa-propagate.h" #include "ipa-utils.h" #include "tree-cfgcleanup.h" +#include "langhooks.h" /* TODO: @@ -4328,7 +4329,7 @@ eliminate_dom_walker::before_dom_children (basic_block b) dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, loc, "converting indirect call to " "function %s\n", - cgraph_node::get (fn)->name ()); + lang_hooks.decl_printable_name (fn, 2)); } gimple_call_set_fndecl (call_stmt, fn); maybe_remove_unused_call_args (cfun, call_stmt); -- 2.47.2