mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-20 17:44:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

shrink-wrapping: Fix up prologue block discovery [PR103860]

Browse Source 
The following testcase is miscompiled, because a prologue which
contains subq $8, %rsp instruction is emitted at the start of
a basic block which contains conditional jump that depends on
flags register set in an earlier basic block, the prologue instruction
then clobbers those flags.
Normally this case is checked by can_get_prologue predicate, but this
is done only at the start of the loop.  If we update pro later in the
loop (because some bb shouldn't be duplicated) and then don't push
anything further into vec and the vec is already empty (this can happen
when the new pro is already in bb_with bitmask and either has no successors
(that is the case in the testcase where that bb ends with a trap) or
all the successors are already in bb_with, then the loop doesn't iterate
further and can_get_prologue will not be checked.

The following simple patch makes sure we call can_get_prologue even after
the last former iteration when vec is already empty and only break from
the loop afterwards (and only if the updating of pro done because of
!can_get_prologue didn't push anything into vec again).

2021-12-30  Jakub Jelinek  <jakub@redhat.com>

	PR rtl-optimization/103860
	* shrink-wrap.c (try_shrink_wrapping): Make sure can_get_prologue is
	called on pro even if nothing further is pushed into vec.

	* gcc.dg/pr103860.c: New test.
This commit is contained in:
Jakub Jelinek 2021-12-30 14:23:18 +01:00
parent dc1969dab3
commit 1820137ba6
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/shrink-wrap.c
View File

@ -781,7 +781,7 @@ try_shrink_wrapping (edge *entry_edge, rtx_insn *prologue_seq)
unsigned max_grow_size = get_uncond_jump_length ();
max_grow_size *= param_max_grow_copy_bb_insns;
while (!vec.is_empty () && pro != entry)
while (pro != entry)
{
while (pro != entry && !can_get_prologue (pro, prologue_clobbered))
{
@ -791,6 +791,9 @@ try_shrink_wrapping (edge *entry_edge, rtx_insn *prologue_seq)
vec.quick_push (pro);
}
if (vec.is_empty ())
break;
basic_block bb = vec.pop ();
if (!can_dup_for_shrink_wrapping (bb, pro, max_grow_size))
while (!dominated_by_p (CDI_DOMINATORS, bb, pro))

31
gcc/testsuite/gcc.dg/pr103860.c Normal file
View File

@ -0,0 +1,31 @@
/* PR rtl-optimization/103860 */
/* { dg-do run } */
/* { dg-options "-O3" } */
/* { dg-additional-options "-fPIC" { target fpic } } */
static int d, *e;
int f;
__attribute__((noinline)) signed char
foo (signed char b, signed char c)
{
return b + c;
}
int
main ()
{
signed char l;
for (l = -1; l; l = foo (l, 1))
{
while (d < 0)
;
if (d > 0)
{
f = 0;
*e = 0;
}
}
d = 0;
return 0;
}