diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2007-10-15 17:05:19 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2007-10-15 17:05:19 +0000 |
| commit | aa79283408d03841fae2f24d94b5385c978b5a0b (patch) | |
| tree | 731a989575c8ab26aad22c508cf9f5228d2d8afd /gcc | |
| parent | 608a3be9053899916d4f6655e8fc2d1790f9b9d5 (diff) | |
| download | gcc-aa79283408d03841fae2f24d94b5385c978b5a0b.zip gcc-aa79283408d03841fae2f24d94b5385c978b5a0b.tar.gz gcc-aa79283408d03841fae2f24d94b5385c978b5a0b.tar.bz2 | |
re PR middle-end/33706 (gcc_assert failure in verify_eh_edges)
gcc/ChangeLog:
PR middle-end/33706
* tree-inline.c (copy_bb): Use bsi_replace to replace a
__builtin_va_arg_pack-containing call stmt.
gcc/testsuite/ChangeLog:
PR middle-end/33706
* gcc.dg/va-arg-pack-2.c: New.
From-SVN: r129355
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/va-arg-pack-2.c | 17 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 15 |
4 files changed, 40 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f2849b9..f627ef7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2007-10-15 Alexandre Oliva <aoliva@redhat.com> + + PR middle-end/33706 + * tree-inline.c (copy_bb): Use bsi_replace to replace a + __builtin_va_arg_pack-containing call stmt. + 2007-10-15 Razya Ladelsky <razya@il.ibm.com> * matrix-reorg.c (gate_matrix_reorg): Don't comment out whole diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c541b3c..7f09cdd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-10-15 Alexandre Oliva <aoliva@redhat.com> + + PR middle-end/33706 + * gcc.dg/va-arg-pack-2.c: New. + 2007-10-15 Jakub Jelinek <jakub@redhat.com> PR tree-optimization/33619 diff --git a/gcc/testsuite/gcc.dg/va-arg-pack-2.c b/gcc/testsuite/gcc.dg/va-arg-pack-2.c new file mode 100644 index 0000000..417248a --- /dev/null +++ b/gcc/testsuite/gcc.dg/va-arg-pack-2.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +extern void noreturn (int status, ...); + +extern inline __attribute ((always_inline)) void +error (int status, ...) +{ + if (__builtin_constant_p (status)) + noreturn (status, __builtin_va_arg_pack ()); +} + +void +f (void) +{ + error (1); +} diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index f575b27..7ebfbcd 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -863,9 +863,18 @@ copy_bb (copy_body_data *id, basic_block bb, int frequency_scale, int count_scal if (TREE_CODE (*call_ptr) == WITH_SIZE_EXPR) call_ptr = &TREE_OPERAND (*call_ptr, 0); gcc_assert (*call_ptr == call); - *call_ptr = new_call; - stmt = *stmtp; - update_stmt (stmt); + if (call_ptr == stmtp) + { + bsi_replace (©_bsi, new_call, true); + stmtp = bsi_stmt_ptr (copy_bsi); + stmt = *stmtp; + } + else + { + *call_ptr = new_call; + stmt = *stmtp; + update_stmt (stmt); + } } else if (call && id->call_expr |