From db9bb323d260512de49906a9f136d25d5171f6f9 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 30 Sep 2014 12:39:03 +0200 Subject: [PATCH] re PR inline-asm/63282 (ICE in redirect_jump_1) PR inline-asm/63282 * ifcvt.c (dead_or_predicable): Don't call redirect_jump_1 or invert_jump_1 if jump isn't any_condjump_p. * gcc.c-torture/compile/pr63282.c: New test. From-SVN: r215714 --- gcc/ChangeLog | 6 ++++++ gcc/ifcvt.c | 3 +++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/compile/pr63282.c | 13 +++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr63282.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 86cc14fad27f..71a9fbef630d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-09-30 Jakub Jelinek + + PR inline-asm/63282 + * ifcvt.c (dead_or_predicable): Don't call redirect_jump_1 + or invert_jump_1 if jump isn't any_condjump_p. + 2014-09-29 Charles Baylis Backport from mainline r212303 diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index dd6df5bc80a6..70a84d257755 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -4271,6 +4271,9 @@ dead_or_predicable (basic_block test_bb, basic_block merge_bb, old_dest = JUMP_LABEL (jump); if (other_bb != new_dest) { + if (!any_condjump_p (jump)) + goto cancel; + if (JUMP_P (BB_END (dest_edge->src))) new_dest_label = JUMP_LABEL (BB_END (dest_edge->src)); else if (new_dest == EXIT_BLOCK_PTR) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7143edb80beb..7bcdf7a9e00a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-09-30 Jakub Jelinek + + PR inline-asm/63282 + * gcc.c-torture/compile/pr63282.c: New test. + 2014-09-26 Jakub Jelinek * g++.dg/compat/struct-layout-1_generate.c: Add -Wno-abi diff --git a/gcc/testsuite/gcc.c-torture/compile/pr63282.c b/gcc/testsuite/gcc.c-torture/compile/pr63282.c new file mode 100644 index 000000000000..cb23278d50d5 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr63282.c @@ -0,0 +1,13 @@ +/* PR inline-asm/63282 */ + +void bar (void); + +void +foo (void) +{ + asm volatile goto ("" : : : : a, b); +a: + bar (); +b: + return; +} -- 2.47.2