[gcc(refs/users/marxin/heads/loop-unswitching-switch-v5)] Simplify usage of rangers.

[gcc(refs/users/marxin/heads/loop-unswitching-switch-v5)] Simplify usage of rangers.

[Martin Liska]

https://gcc.gnu.org/g:40938b48c0592abe728abae7d72f7331adb88c3a

commit 40938b48c0592abe728abae7d72f7331adb88c3a
Author: Martin Liska <mliska@suse.cz>
Date:   Mon Nov 8 15:52:26 2021 +0100

    Simplify usage of rangers.

Diff:
---
 gcc/tree-ssa-loop-unswitch.c | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/gcc/tree-ssa-loop-unswitch.c b/gcc/tree-ssa-loop-unswitch.c
index a509938c7d0..4b4bd471acd 100644
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -383,29 +383,15 @@ tree_unswitch_single_loop (class loop *loop, int num)
 
       if (condition != NULL)
 	{
+	  tree result;
 	  int_range_max r;
-	  edge edge_true, edge_false;
-	  extract_true_false_edges_from_block (bbs[i], &edge_true, &edge_false);
-	  tree cond = gimple_cond_lhs (stmt);
 
-	  if (r.supports_type_p (TREE_TYPE (cond)))
+	  if (ranger.range_of_stmt (r, stmt) && r.singleton_p (&result))
 	    {
-	      if (ranger.range_on_edge (r, edge_true, cond)
-		  && r.undefined_p ())
-		{
-		  gimple_cond_set_condition_from_tree (condition,
-						       boolean_false_node);
-		  update_stmt (condition);
-		  changed = true;
-		}
-	      else if(ranger.range_on_edge (r, edge_false, gimple_cond_lhs (stmt))
-		      && r.undefined_p ())
-		{
-		  gimple_cond_set_condition_from_tree (condition,
-						       boolean_true_node);
-		  update_stmt (condition);
-		  changed = true;
-		}
+	      gimple_cond_set_condition_from_tree (condition,
+						   result);
+	      update_stmt (condition);
+	      changed = true;
 	    }
 	}
       else if (swtch != NULL)

[gcc(refs/users/marxin/heads/loop-unswitching-switch-v5)] Simplify usage of rangers.

[Martin Liska]

https://gcc.gnu.org/g:0534ab9eebb1900fc172e014a515c94119c411ac

commit 0534ab9eebb1900fc172e014a515c94119c411ac
Author: Martin Liska <mliska@suse.cz>
Date:   Mon Nov 8 15:52:26 2021 +0100

    Simplify usage of rangers.

Diff:
---
 gcc/tree-ssa-loop-unswitch.c | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/gcc/tree-ssa-loop-unswitch.c b/gcc/tree-ssa-loop-unswitch.c
index a509938c7d0..4b4bd471acd 100644
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -383,29 +383,15 @@ tree_unswitch_single_loop (class loop *loop, int num)
 
       if (condition != NULL)
 	{
+	  tree result;
 	  int_range_max r;
-	  edge edge_true, edge_false;
-	  extract_true_false_edges_from_block (bbs[i], &edge_true, &edge_false);
-	  tree cond = gimple_cond_lhs (stmt);
 
-	  if (r.supports_type_p (TREE_TYPE (cond)))
+	  if (ranger.range_of_stmt (r, stmt) && r.singleton_p (&result))
 	    {
-	      if (ranger.range_on_edge (r, edge_true, cond)
-		  && r.undefined_p ())
-		{
-		  gimple_cond_set_condition_from_tree (condition,
-						       boolean_false_node);
-		  update_stmt (condition);
-		  changed = true;
-		}
-	      else if(ranger.range_on_edge (r, edge_false, gimple_cond_lhs (stmt))
-		      && r.undefined_p ())
-		{
-		  gimple_cond_set_condition_from_tree (condition,
-						       boolean_true_node);
-		  update_stmt (condition);
-		  changed = true;
-		}
+	      gimple_cond_set_condition_from_tree (condition,
+						   result);
+	      update_stmt (condition);
+	      changed = true;
 	    }
 	}
       else if (swtch != NULL)