diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ipa/devirt-52.C | 56 | ||||
| -rw-r--r-- | gcc/tree-cfgcleanup.c | 9 | ||||
| -rw-r--r-- | gcc/tree-ssa-pre.c | 9 |
5 files changed, 86 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2f19c25..9bb3824 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2016-08-17 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/77259 + * tree-ssa-pre.c (eliminate_dom_walker::before_dom_children): If + turning a call into __builtin_unreachable-like noreturn call, adjust + gimple_call_set_fntype. + * tree-cfgcleanup.c (fixup_noreturn_call): Remove lhs also if + gimple_call_fntype has void return type. + 2016-08-17 Chung-Lin Tang <cltang@codesourcery.com> * omp-low.c (lower_oacc_reductions): Adjust variable lookup to use diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0595ceb..3623885 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-08-17 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/77259 + * g++.dg/ipa/devirt-52.C: New test. + 2016-08-17 Chung-Lin Tang <cltang@codesourcery.com> * c-c++-common/goacc/reduction-6.c: New testcase. diff --git a/gcc/testsuite/g++.dg/ipa/devirt-52.C b/gcc/testsuite/g++.dg/ipa/devirt-52.C new file mode 100644 index 0000000..be0ab4c --- /dev/null +++ b/gcc/testsuite/g++.dg/ipa/devirt-52.C @@ -0,0 +1,56 @@ +// PR middle-end/77259 +// { dg-do compile { target c++11 } } +// { dg-options "-O2" } + +template <typename, typename = int> class A; +template <typename, typename> struct A +{ + A (A &&); +}; +template <typename S, typename T, typename U> +A<S> operator+(S *, const A<T, U> &); +template <typename S, typename T, typename U> +void operator+(const A<T, U> &, S *); +struct B +{ + template <typename V> B (V); +}; +template <typename V> V foo (B) {} +class C; +template <typename> struct D +{ + C *operator->() { return d; } + C *d; +}; +struct C +{ + virtual A<int> bar (); +}; +struct E +{ + ~E (); + virtual A<char> bar (const B &) const; +}; +template <typename> struct F : E +{ +}; +template <typename W> struct F<D<W>> : E +{ + A<char> bar (const B &) const try + { + D<W> a = baz (); + } + catch (int) + { + } + D<W> baz () const + { + D<C> b = foo<D<C>>(0); + "" + b->bar () + ""; + } +}; +struct G : F<D<int>> +{ + G (int); +}; +void test () { G (0); } diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c index 3fe0d3e..6052872 100644 --- a/gcc/tree-cfgcleanup.c +++ b/gcc/tree-cfgcleanup.c @@ -602,9 +602,14 @@ fixup_noreturn_call (gimple *stmt) /* If there is an LHS, remove it, but only if its type has fixed size. The LHS will need to be recreated during RTL expansion and creating temporaries of variable-sized types is not supported. Also don't - do this with TREE_ADDRESSABLE types, as assign_temp will abort. */ + do this with TREE_ADDRESSABLE types, as assign_temp will abort. + Drop LHS regardless of TREE_ADDRESSABLE, if the function call + has been changed into a call that does not return a value, like + __builtin_unreachable or __cxa_pure_virtual. */ tree lhs = gimple_call_lhs (stmt); - if (should_remove_lhs_p (lhs)) + if (lhs + && (should_remove_lhs_p (lhs) + || VOID_TYPE_P (TREE_TYPE (gimple_call_fntype (stmt))))) { gimple_call_set_lhs (stmt, NULL_TREE); diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index edc3fdf..5d21c80 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -4543,6 +4543,15 @@ eliminate_dom_walker::before_dom_children (basic_block b) lang_hooks.decl_printable_name (fn, 2)); } gimple_call_set_fndecl (call_stmt, fn); + /* If changing the call to __builtin_unreachable + or similar noreturn function, adjust gimple_call_fntype + too. */ + if (gimple_call_noreturn_p (call_stmt) + && VOID_TYPE_P (TREE_TYPE (TREE_TYPE (fn))) + && TYPE_ARG_TYPES (TREE_TYPE (fn)) + && (TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (fn))) + == void_type_node)) + gimple_call_set_fntype (call_stmt, TREE_TYPE (fn)); maybe_remove_unused_call_args (cfun, call_stmt); gimple_set_modified (stmt, true); } |