From 959f8cd7dac3ddd84c486ab0ab584513f2d150a6 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 10 Nov 2008 14:48:06 +0100 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/tree-mudflap.c | 9 +++++++++ libmudflap/ChangeLog | 5 +++++ libmudflap/testsuite/libmudflap.c/pass67-frag.c | 14 ++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 libmudflap/testsuite/libmudflap.c/pass67-frag.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 62f857f4aa6f..d3ad211876a7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-11-10 Jakub Jelinek + + 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 PR middle-end/37807 diff --git a/gcc/tree-mudflap.c b/gcc/tree-mudflap.c index 0b3eba5ddad6..831fcc1791a8 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 9214759b304c..208ab8fb99b9 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,8 @@ +2008-11-10 Jakub Jelinek + + PR middle-end/35314 + * testsuite/libmudflap.c/pass67-frag.c: New test. + 2008-10-09 Jakub Jelinek 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 000000000000..0c2f81a17054 --- /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 + +jmp_buf buf; + +void +foo (volatile char *p) +{ + if (__builtin_setjmp (buf)) + *p; +}