FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Limit special asan/ubsan/bitint returns_twice handling to calls in bbs with abnormal pred [PR114687]

Browse source 
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.
	* gimple-lower-bitint.cc (bitint_large_huge::lower_call): Only
	push to m_returns_twice_calls if bb_has_abnormal_pred.

	* gcc.dg/asan/pr114687.c: New test.
This commit is contained in:
Jakub Jelinek 2024-04-12 10:59:54 +02:00
parent e30e760b51
commit c9e94ae448
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/gimple-iterator.cc
View file

@ -1049,7 +1049,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);
@ -1072,7 +1073,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);

2
gcc/gimple-lower-bitint.cc
View file

@ -5320,7 +5320,7 @@ bitint_large_huge::lower_call (tree obj, gimple *stmt)
arg = make_ssa_name (TREE_TYPE (arg));
gimple *g = gimple_build_assign (arg, v);
gsi_insert_before (&gsi, g, GSI_SAME_STMT);
if (returns_twice)
if (returns_twice && bb_has_abnormal_pred (gimple_bb (stmt)))
{
m_returns_twice_calls.safe_push (stmt);
returns_twice = false;

22
gcc/testsuite/gcc.dg/asan/pr114687.c Normal file
View file

@ -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;
}