aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2014-09-30 12:30:45 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2014-09-30 12:30:45 +0200
commitb58fd59ad5ece79c494cbac3b30ff2ca8458563a (patch)
tree4f5654a607bd4ec71f788a795ac7f43acdb48eeb
parent2f6403f1337686599ddce4c01798274081fe2c35 (diff)
downloadgcc-b58fd59ad5ece79c494cbac3b30ff2ca8458563a.zip
gcc-b58fd59ad5ece79c494cbac3b30ff2ca8458563a.tar.gz
gcc-b58fd59ad5ece79c494cbac3b30ff2ca8458563a.tar.bz2
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: r215712
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/ifcvt.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr63282.c13
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 766e935..47964d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-30 Jakub Jelinek <jakub@redhat.com>
+
+ 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-30 Terry Guo <terry.guo@arm.com>
* config/arm/arm-cores.def (cortex-m7): New core name.
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 6bcc23a..b6b479f 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -4357,6 +4357,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_FOR_FN (cfun))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4f608cf..8e51806 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-30 Jakub Jelinek <jakub@redhat.com>
+
+ PR inline-asm/63282
+ * gcc.c-torture/compile/pr63282.c: New test.
+
2014-09-29 Eric Botcazou <ebotcazou@adacore.com>
* gcc.dg/tree-ssa/vrp94.c: New test.
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 0000000..cb23278
--- /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;
+}