diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2023-04-12 16:55:15 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2023-04-12 16:55:15 +0200 |
| commit | 51856718a82ce60f067910d9037ca255645b37eb (patch) | |
| tree | b943e384e80ef8b6d789fb2041d76cb92db2f7d4 | |
| parent | 4073ce2c4e5584c1be58fbe76dd66285de2529bb (diff) | |
| download | gcc-51856718a82ce60f067910d9037ca255645b37eb.zip gcc-51856718a82ce60f067910d9037ca255645b37eb.tar.gz gcc-51856718a82ce60f067910d9037ca255645b37eb.tar.bz2 | |
reassoc: Fix up another ICE with returns_twice call [PR109410]
The following testcase ICEs in reassoc, unlike the last case I've fixed
there here SSA_NAME_USED_IN_ABNORMAL_PHI is not the case anywhere.
build_and_add_sum places new statements after the later appearing definition
of an operand but if both operands are default defs or constants, we place
statement at the start of the function.
If the very first statement of a function is a call to returns_twice
function, this doesn't work though, because that call has to be the first
thing in its basic block, so the following patch splits the entry successor
edge such that the new statements are added into a different block from the
returns_twice call.
I think we should in stage1 reconsider such placements, I think it
unnecessarily enlarges the lifetime of the new lhs if its operand(s)
are used more than once in the function. Unless something sinks those
again. Would be nice to place it closer to the actual uses (or where
they will be placed).
2023-04-12 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/109410
* tree-ssa-reassoc.cc (build_and_add_sum): Split edge from entry
block if first statement of the function is a call to returns_twice
function.
* gcc.dg/pr109410.c: New test.
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr109410.c | 19 | ||||
| -rw-r--r-- | gcc/tree-ssa-reassoc.cc | 9 |
2 files changed, 28 insertions, 0 deletions
diff --git a/gcc/testsuite/gcc.dg/pr109410.c b/gcc/testsuite/gcc.dg/pr109410.c new file mode 100644 index 0000000..a6401fc --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr109410.c @@ -0,0 +1,19 @@ +/* PR tree-optimization/109410 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +__attribute__((returns_twice)) int baz (int, int); + +int +bar (int x) +{ + return x; +} + +int +foo (int x, int y) +{ + baz (x, y); + int a = bar (x); + return y || a == 42 || a > 42; +} diff --git a/gcc/tree-ssa-reassoc.cc b/gcc/tree-ssa-reassoc.cc index 8fd2259..067a3f0 100644 --- a/gcc/tree-ssa-reassoc.cc +++ b/gcc/tree-ssa-reassoc.cc @@ -1564,6 +1564,15 @@ build_and_add_sum (tree type, tree op1, tree op2, enum tree_code opcode) && (!op2def || gimple_nop_p (op2def))) { gsi = gsi_after_labels (single_succ (ENTRY_BLOCK_PTR_FOR_FN (cfun))); + if (!gsi_end_p (gsi) + && is_gimple_call (gsi_stmt (gsi)) + && (gimple_call_flags (gsi_stmt (gsi)) & ECF_RETURNS_TWICE)) + { + /* Don't add statements before a returns_twice call at the start + of a function. */ + split_edge (single_succ_edge (ENTRY_BLOCK_PTR_FOR_FN (cfun))); + gsi = gsi_after_labels (single_succ (ENTRY_BLOCK_PTR_FOR_FN (cfun))); + } if (gsi_end_p (gsi)) { gimple_stmt_iterator gsi2 |