diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr46165.c | 11 | ||||
| -rw-r--r-- | gcc/tree-ssa-pre.c | 6 |
4 files changed, 28 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6d4d1b5..0454a9f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-11-03 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/46165 + * tree-ssa-pre.c (eliminate): Return TODO_cleanup_cfg if changing + a normal call into noreturn call. + 2010-11-03 Richard Guenther <rguenther@suse.de> PR middle-end/46251 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 184ebdb..d97167a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-11-03 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/46165 + * gcc.dg/pr46165.c: New test. + 2010-11-03 Richard Guenther <rguenther@suse.de> PR middle-end/46251 diff --git a/gcc/testsuite/gcc.dg/pr46165.c b/gcc/testsuite/gcc.dg/pr46165.c new file mode 100644 index 0000000..a13300e --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr46165.c @@ -0,0 +1,11 @@ +/* PR tree-optimization/46165 */ +/* { dg-do compile } */ +/* { dg-options "-O -fno-tree-ccp -fno-tree-copy-prop -fno-tree-dce" } */ + +extern void foo (void) __attribute__((noreturn)); +void +g (void) +{ + void (*f) (void) = foo; + f (); +} diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index 8f91bd6..fda9437 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -4364,6 +4364,7 @@ eliminate (void) { bool can_make_abnormal_goto = stmt_can_make_abnormal_goto (stmt); + bool was_noreturn = gimple_call_noreturn_p (stmt); if (dump_file && (dump_flags & TDF_DETAILS)) { @@ -4376,6 +4377,11 @@ eliminate (void) gimple_call_set_fn (stmt, fn); update_stmt (stmt); + /* When changing a call into a noreturn call, cfg cleanup + is needed to fix up the noreturn call. */ + if (!was_noreturn && gimple_call_noreturn_p (stmt)) + todo |= TODO_cleanup_cfg; + /* If we removed EH side-effects from the statement, clean its EH information. */ if (maybe_clean_or_replace_eh_stmt (stmt, stmt)) |