re PR target/69015 (ICE: RTL check: expected code 'code_label', have 'return' in...

	PR target/69015
	* ifcvt.c (find_cond_trap): Give up if returnjump_p (jump).

	* gcc.dg/pr69015.c: New test.

From-SVN: r232020

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 941f9818b57c308f6e8ab9a7e51357b87ff76afd..32d3ecf545e4f36ee6d1e20805a0889ae8a76d7e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-01  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/69015
+       * ifcvt.c (find_cond_trap): Give up if returnjump_p (jump).
 \f
 Copyright (C) 2016 Free Software Foundation, Inc.
 

diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 6164232c0c55fe80dbbadb5e6482ff79a5b0ece0..1112ad0df393a89a452ed4af6dd75085b644f240 100644 (file)
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -4526,8 +4526,11 @@ find_cond_trap (basic_block test_bb, edge then_edge, edge else_edge)
     return FALSE;
 
   /* If the conditional jump is more than just a conditional jump, then
-     we can not do if-conversion on this block.  */
-  if (! onlyjump_p (jump))
+     we can not do if-conversion on this block.  Give up for returnjump_p,
+     changing a conditional return followed by unconditional trap for
+     conditional trap followed by unconditional return is likely not
+     beneficial and harder to handle.  */
+  if (! onlyjump_p (jump) || returnjump_p (jump))
     return FALSE;
 
   /* We must be comparing objects whose modes imply the size.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 941f9818b57c308f6e8ab9a7e51357b87ff76afd..178c13ee2d95cd1df611a8b074298a8fe02d9042 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-01  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/69015
+       * gcc.dg/pr69015.c: New test.
 \f
 Copyright (C) 2016 Free Software Foundation, Inc.
 

diff --git a/gcc/testsuite/gcc.dg/pr69015.c b/gcc/testsuite/gcc.dg/pr69015.c
new file mode 100644 (file)
index 0000000..9e75db9
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr69015.c
@@ -0,0 +1,10 @@
+/* PR target/69015 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fno-if-conversion" } */
+
+void
+foo (int c)
+{
+  if (c)
+    __builtin_trap ();
+}