aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-inline.c
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2007-10-15 17:05:19 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2007-10-15 17:05:19 +0000
commitaa79283408d03841fae2f24d94b5385c978b5a0b (patch)
tree731a989575c8ab26aad22c508cf9f5228d2d8afd /gcc/tree-inline.c
parent608a3be9053899916d4f6655e8fc2d1790f9b9d5 (diff)
downloadgcc-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/tree-inline.c')
-rw-r--r--gcc/tree-inline.c15
1 files changed, 12 insertions, 3 deletions
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 (&copy_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