Limit special asan/ubsan/bitint returns_twice handling to calls in bbs with abnormal...

The tree-cfg.cc verifier only diagnoses returns_twice calls preceded
by non-label/debug stmts if it is in a bb with abnormal predecessor.
The following testcase shows that if a user lies in the attributes
(a function which never returns can't be pure, and can't return
twice when it doesn't ever return at all), when we figure it out,
we can remove the abnormal edges to the "returns_twice" call and perhaps
whole .ABNORMAL_DISPATCHER etc.
edge_before_returns_twice_call then ICEs because it can't find such
an edge.

The following patch limits the special handling to calls in bbs where
the verifier requires that.

2024-04-12  Jakub Jelinek  <jakub@redhat.com>

	PR sanitizer/114687
	* gimple-iterator.cc (gsi_safe_insert_before): Only use
	edge_before_returns_twice_call if bb_has_abnormal_pred.
	(gsi_safe_insert_seq_before): Likewise.

	* gcc.dg/asan/pr114687.c: New test.

(cherry picked from commit c9e94ae448ba309dba74de3ee1974a3ed9248889)

diff --git a/gcc/gimple-iterator.cc b/gcc/gimple-iterator.cc
index 07a77ca2a77773d695f811849db2f367a9f0ba81..ee1081dec1aeb73dd8541f4d663c7e1857fcc987 100644 (file)
--- a/gcc/gimple-iterator.cc
+++ b/gcc/gimple-iterator.cc
@@ -1048,7 +1048,8 @@ gsi_safe_insert_before (gimple_stmt_iterator *iter, gimple *g)
   gimple *stmt = gsi_stmt (*iter);
   if (stmt
       && is_gimple_call (stmt)
-      && (gimple_call_flags (stmt) & ECF_RETURNS_TWICE) != 0)
+      && (gimple_call_flags (stmt) & ECF_RETURNS_TWICE) != 0
+      && bb_has_abnormal_pred (gsi_bb (*iter)))
     {
       edge e = edge_before_returns_twice_call (gsi_bb (*iter));
       basic_block new_bb = gsi_insert_on_edge_immediate (e, g);
@@ -1071,7 +1072,8 @@ gsi_safe_insert_seq_before (gimple_stmt_iterator *iter, gimple_seq seq)
   gimple *stmt = gsi_stmt (*iter);
   if (stmt
       && is_gimple_call (stmt)
-      && (gimple_call_flags (stmt) & ECF_RETURNS_TWICE) != 0)
+      && (gimple_call_flags (stmt) & ECF_RETURNS_TWICE) != 0
+      && bb_has_abnormal_pred (gsi_bb (*iter)))
     {
       edge e = edge_before_returns_twice_call (gsi_bb (*iter));
       gimple *f = gimple_seq_first_stmt (seq);

diff --git a/gcc/testsuite/gcc.dg/asan/pr114687.c b/gcc/testsuite/gcc.dg/asan/pr114687.c
new file mode 100644 (file)
index 0000000..48cc868
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/asan/pr114687.c
@@ -0,0 +1,22 @@
+/* PR sanitizer/114687 */
+/* { dg-do compile } */
+
+int a;
+int foo (int);
+
+__attribute__((pure, returns_twice)) int
+bar (void)
+{
+  a = 1;
+  while (a)
+    a = 2;
+  return a;
+}
+
+int
+baz (void)
+{
+  int d = bar ();
+  foo (d);
+  return 0;
+}