[2/2] Revert maybe_ne -> known_ne change in vn_reference_lookup_3

Message ID 20220701121951.C85F413A20@imap2.suse-dmz.suse.de
State Committed
Commit 2b0937946b19f0f4d91e6248a2806b1f98f5244b
Headers
Series [1/2] Make sure checking code is conditional in VN |

Commit Message

Richard Biener July 1, 2022, 12:19 p.m. UTC
  This reverts the change as discussed.

Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed.

2022-07-01  Richard Biener  <rguenther@suse.de>

	* tree-ssa-sccvn.cc (vn_reference_lookup_3): Revert
	back to using maybe_ne (off, -1).
---
 gcc/tree-ssa-sccvn.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Richard Sandiford July 1, 2022, 12:34 p.m. UTC | #1
Richard Biener via Gcc-patches <gcc-patches@gcc.gnu.org> writes:
> This reverts the change as discussed.

Thanks!

> Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed.
>
> 2022-07-01  Richard Biener  <rguenther@suse.de>
>
> 	* tree-ssa-sccvn.cc (vn_reference_lookup_3): Revert
> 	back to using maybe_ne (off, -1).
> ---
>  gcc/tree-ssa-sccvn.cc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc
> index c40c45ed840..f41d5031365 100644
> --- a/gcc/tree-ssa-sccvn.cc
> +++ b/gcc/tree-ssa-sccvn.cc
> @@ -3243,12 +3243,12 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
>        poly_int64 extra_off = 0;
>        if (j == 0 && i >= 0
>  	  && lhs_ops[0].opcode == MEM_REF
> -	  && known_ne (lhs_ops[0].off, -1))
> +	  && maybe_ne (lhs_ops[0].off, -1))
>  	{
>  	  if (known_eq (lhs_ops[0].off, vr->operands[i].off))
>  	    i--, j--;
>  	  else if (vr->operands[i].opcode == MEM_REF
> -		   && known_ne (vr->operands[i].off, -1))
> +		   && maybe_ne (vr->operands[i].off, -1))
>  	    {
>  	      extra_off = vr->operands[i].off - lhs_ops[0].off;
>  	      i--, j--;
  

Patch

diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc
index c40c45ed840..f41d5031365 100644
--- a/gcc/tree-ssa-sccvn.cc
+++ b/gcc/tree-ssa-sccvn.cc
@@ -3243,12 +3243,12 @@  vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
       poly_int64 extra_off = 0;
       if (j == 0 && i >= 0
 	  && lhs_ops[0].opcode == MEM_REF
-	  && known_ne (lhs_ops[0].off, -1))
+	  && maybe_ne (lhs_ops[0].off, -1))
 	{
 	  if (known_eq (lhs_ops[0].off, vr->operands[i].off))
 	    i--, j--;
 	  else if (vr->operands[i].opcode == MEM_REF
-		   && known_ne (vr->operands[i].off, -1))
+		   && maybe_ne (vr->operands[i].off, -1))
 	    {
 	      extra_off = vr->operands[i].off - lhs_ops[0].off;
 	      i--, j--;