backport: re PR rtl-optimization/90082 (ICE in delete_unmarked_insns, at dce.c:653)

	Backported from mainline
	2019-04-16  Jakub Jelinek  <jakub@redhat.com>

	PR rtl-optimization/90082
	* dce.c (can_delete_call): New function.
	(deletable_insn_p, mark_insn): Use it.

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

From-SVN: r275149

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d599c7d4b9524c044d998034ab2d94487630786..e02a1d1033b65d74b62158bc441dd46f0df233c6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,10 @@
        Backported from mainline
        2019-04-16  Jakub Jelinek  <jakub@redhat.com>
 
+       PR rtl-optimization/90082
+       * dce.c (can_delete_call): New function.
+       (deletable_insn_p, mark_insn): Use it.
+
        PR tree-optimization/90090
        * tree-ssa-math-opts.c (is_division_by): Ignore divisions that can
        throw internally.

diff --git a/gcc/dce.c b/gcc/dce.c
index afdd6d8b4008a648cb38244daa173573c2f3ec08..a860458d56e86400d86433d791ddebbdd1dbe5d9 100644 (file)
--- a/gcc/dce.c
+++ b/gcc/dce.c
@@ -86,6 +86,32 @@ deletable_insn_p_1 (rtx body)
     }
 }
 
+/* Don't delete calls that may throw if we cannot do so.  */
+
+static bool
+can_delete_call (rtx_insn *insn)
+{
+  if (cfun->can_delete_dead_exceptions && can_alter_cfg)
+    return true;
+  if (!insn_nothrow_p (insn))
+    return false;
+  if (can_alter_cfg)
+    return true;
+  /* If we can't alter cfg, even when the call can't throw exceptions, it
+     might have EDGE_ABNORMAL_CALL edges and so we shouldn't delete such
+     calls.  */
+  gcc_assert (CALL_P (insn));
+  if (BLOCK_FOR_INSN (insn) && BB_END (BLOCK_FOR_INSN (insn)) == insn)
+    {
+      edge e;
+      edge_iterator ei;
+
+      FOR_EACH_EDGE (e, ei, BLOCK_FOR_INSN (insn)->succs)
+       if ((e->flags & EDGE_ABNORMAL_CALL) != 0)
+         return false;
+    }
+  return true;
+}
 
 /* Return true if INSN is a normal instruction that can be deleted by
    the DCE pass.  */
@@ -110,8 +136,7 @@ deletable_insn_p (rtx_insn *insn, bool fast, bitmap arg_stores)
       && (RTL_CONST_OR_PURE_CALL_P (insn)
          && !RTL_LOOPING_CONST_OR_PURE_CALL_P (insn))
       /* Don't delete calls that may throw if we cannot do so.  */
-      && ((cfun->can_delete_dead_exceptions && can_alter_cfg)
-         || insn_nothrow_p (insn)))
+      && can_delete_call (insn))
     return find_call_stack_args (as_a <rtx_call_insn *> (insn), false,
                                 fast, arg_stores);
 
@@ -204,8 +229,7 @@ mark_insn (rtx_insn *insn, bool fast)
          && !SIBLING_CALL_P (insn)
          && (RTL_CONST_OR_PURE_CALL_P (insn)
              && !RTL_LOOPING_CONST_OR_PURE_CALL_P (insn))
-         && ((cfun->can_delete_dead_exceptions && can_alter_cfg)
-             || insn_nothrow_p (insn)))
+         && can_delete_call (insn))
        find_call_stack_args (as_a <rtx_call_insn *> (insn), true, fast, NULL);
     }
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c7808b867d7dd3859aaa60c26bf57cff3cf56902..978d725437ec2c8b4b3659caff88b2be9fb2987f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,9 @@
        Backported from mainline
        2019-04-16  Jakub Jelinek  <jakub@redhat.com>
 
+       PR rtl-optimization/90082
+       * gcc.dg/pr90082.c: New test.
+
        PR tree-optimization/90090
        * g++.dg/opt/pr90090.C: New test.
 

diff --git a/gcc/testsuite/gcc.dg/pr90082.c b/gcc/testsuite/gcc.dg/pr90082.c
new file mode 100644 (file)
index 0000000..bb8293f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr90082.c
@@ -0,0 +1,13 @@
+/* PR rtl-optimization/90082 */
+/* { dg-do compile } */
+/* { dg-options "-O1 -fnon-call-exceptions -ftrapv" } */
+
+void *buf[5];
+
+void
+foo (int a)
+{
+  if (__builtin_setjmp (buf) == 0)
+    __asm__ ("" : : "n" (a * 2));      /* { dg-error "impossible constraint in 'asm'" } */
+                                       /* { dg-warning "asm operand 0 probably doesn't match constraints" "" { target *-*-* } .-1 } */
+}