* [PATCH] Fix PR 103317, ICE after PHI-OPT, minmax_replacement producing invalid SSA
@ 2021-11-19 1:53 apinski
2021-11-19 7:12 ` Richard Biener
0 siblings, 1 reply; 2+ messages in thread
From: apinski @ 2021-11-19 1:53 UTC (permalink / raw)
To: gcc-patches; +Cc: Andrew Pinski
From: Andrew Pinski <apinski@marvell.com>
The problem is r12-5300-gf98f373dd822b35c allows phiopt to recognize more basic blocks
but missed one location where the basic block does not need to be empty but still
needs to have a single predecessor. This patch fixes that over sight.
OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.
PR tree-optimization/103317
gcc/ChangeLog:
* tree-ssa-phiopt.c (minmax_replacement): For the non empty
middle bb case, check to make sure it has a single predecessor.
gcc/testsuite/ChangeLog:
* gcc.c-torture/compile/pr103317-1.c: New test.
---
gcc/testsuite/gcc.c-torture/compile/pr103317-1.c | 13 +++++++++++++
gcc/tree-ssa-phiopt.c | 3 +++
2 files changed, 16 insertions(+)
create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr103317-1.c
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr103317-1.c b/gcc/testsuite/gcc.c-torture/compile/pr103317-1.c
new file mode 100644
index 00000000000..f9d145e0da9
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr103317-1.c
@@ -0,0 +1,13 @@
+int a, b;
+char c;
+void
+d (void)
+{
+ char e = c;
+ if (b)
+ if (c < 16 - 11)
+ e = 16 - 11;
+ if (e > 8)
+ e = 8;
+ a = e;
+}
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index f0431684089..1abc4ea21cc 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -1780,6 +1780,9 @@ minmax_replacement (basic_block cond_bb, basic_block middle_bb,
gimple *assign = last_and_only_stmt (middle_bb);
tree lhs, op0, op1, bound;
+ if (!single_pred_p (middle_bb))
+ return false;
+
if (!assign
|| gimple_code (assign) != GIMPLE_ASSIGN)
return false;
--
2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix PR 103317, ICE after PHI-OPT, minmax_replacement producing invalid SSA
2021-11-19 1:53 [PATCH] Fix PR 103317, ICE after PHI-OPT, minmax_replacement producing invalid SSA apinski
@ 2021-11-19 7:12 ` Richard Biener
0 siblings, 0 replies; 2+ messages in thread
From: Richard Biener @ 2021-11-19 7:12 UTC (permalink / raw)
To: Andrew Pinski; +Cc: GCC Patches
On Fri, Nov 19, 2021 at 2:54 AM apinski--- via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> From: Andrew Pinski <apinski@marvell.com>
>
> The problem is r12-5300-gf98f373dd822b35c allows phiopt to recognize more basic blocks
> but missed one location where the basic block does not need to be empty but still
> needs to have a single predecessor. This patch fixes that over sight.
>
> OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.
OK.
Thanks,
Richard.
> PR tree-optimization/103317
>
> gcc/ChangeLog:
>
> * tree-ssa-phiopt.c (minmax_replacement): For the non empty
> middle bb case, check to make sure it has a single predecessor.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.c-torture/compile/pr103317-1.c: New test.
> ---
> gcc/testsuite/gcc.c-torture/compile/pr103317-1.c | 13 +++++++++++++
> gcc/tree-ssa-phiopt.c | 3 +++
> 2 files changed, 16 insertions(+)
> create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr103317-1.c
>
> diff --git a/gcc/testsuite/gcc.c-torture/compile/pr103317-1.c b/gcc/testsuite/gcc.c-torture/compile/pr103317-1.c
> new file mode 100644
> index 00000000000..f9d145e0da9
> --- /dev/null
> +++ b/gcc/testsuite/gcc.c-torture/compile/pr103317-1.c
> @@ -0,0 +1,13 @@
> +int a, b;
> +char c;
> +void
> +d (void)
> +{
> + char e = c;
> + if (b)
> + if (c < 16 - 11)
> + e = 16 - 11;
> + if (e > 8)
> + e = 8;
> + a = e;
> +}
> diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
> index f0431684089..1abc4ea21cc 100644
> --- a/gcc/tree-ssa-phiopt.c
> +++ b/gcc/tree-ssa-phiopt.c
> @@ -1780,6 +1780,9 @@ minmax_replacement (basic_block cond_bb, basic_block middle_bb,
> gimple *assign = last_and_only_stmt (middle_bb);
> tree lhs, op0, op1, bound;
>
> + if (!single_pred_p (middle_bb))
> + return false;
> +
> if (!assign
> || gimple_code (assign) != GIMPLE_ASSIGN)
> return false;
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-19 7:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-19 1:53 [PATCH] Fix PR 103317, ICE after PHI-OPT, minmax_replacement producing invalid SSA apinski
2021-11-19 7:12 ` Richard Biener
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).