diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-11-10 14:48:06 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-11-10 14:48:06 +0100 |
| commit | 959f8cd7dac3ddd84c486ab0ab584513f2d150a6 (patch) | |
| tree | e3cef0d637251bfd1b08fca99c3e0bf451588bd0 | |
| parent | c8a5f8f292d2df6181d4e2aafe04ef85b0fe2cc8 (diff) | |
| download | gcc-959f8cd7dac3ddd84c486ab0ab584513f2d150a6.zip gcc-959f8cd7dac3ddd84c486ab0ab584513f2d150a6.tar.gz gcc-959f8cd7dac3ddd84c486ab0ab584513f2d150a6.tar.bz2 | |
re PR middle-end/35314 (ICE with __builtin_setjmp and -fmudflap)
PR middle-end/35314
* tree-mudflap.c (mf_build_check_statement_for): Split then_block
after __mf_check call if the call must end a bb.
* testsuite/libmudflap.c/pass67-frag.c: New test.
From-SVN: r141741
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/tree-mudflap.c | 9 | ||||
| -rw-r--r-- | libmudflap/ChangeLog | 5 | ||||
| -rw-r--r-- | libmudflap/testsuite/libmudflap.c/pass67-frag.c | 14 |
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 62f857f..d3ad211 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-11-10 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/35314 + * tree-mudflap.c (mf_build_check_statement_for): Split then_block + after __mf_check call if the call must end a bb. + 2008-11-10 Ralph Loader <suckfish@ihug.co.nz> PR middle-end/37807 diff --git a/gcc/tree-mudflap.c b/gcc/tree-mudflap.c index 0b3eba5..831fcc1 100644 --- a/gcc/tree-mudflap.c +++ b/gcc/tree-mudflap.c @@ -669,6 +669,15 @@ mf_build_check_statement_for (tree base, tree limit, if (! flag_mudflap_threads) { + if (stmt_ends_bb_p (g)) + { + gsi = gsi_start_bb (then_bb); + gsi_insert_seq_after (&gsi, seq, GSI_CONTINUE_LINKING); + e = split_block (then_bb, g); + then_bb = e->dest; + seq = gimple_seq_alloc (); + } + g = gimple_build_assign (mf_cache_shift_decl_l, mf_cache_shift_decl); gimple_seq_add_stmt (&seq, g); diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index 9214759..208ab8f 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,8 @@ +2008-11-10 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/35314 + * testsuite/libmudflap.c/pass67-frag.c: New test. + 2008-10-09 Jakub Jelinek <jakub@redhat.com> PR c++/37568 diff --git a/libmudflap/testsuite/libmudflap.c/pass67-frag.c b/libmudflap/testsuite/libmudflap.c/pass67-frag.c new file mode 100644 index 0000000..0c2f81a --- /dev/null +++ b/libmudflap/testsuite/libmudflap.c/pass67-frag.c @@ -0,0 +1,14 @@ +/* PR middle-end/35314 */ +/* { dg-do compile } */ +/* { dg-options "-fmudflap" } */ + +#include <setjmp.h> + +jmp_buf buf; + +void +foo (volatile char *p) +{ + if (__builtin_setjmp (buf)) + *p; +} |