[gcc(refs/users/aldyh/heads/threader-refactor)] wip wip

[Aldy Hernandez]

https://gcc.gnu.org/g:038352db447368a872e3871f4cab4553c27a222e

commit 038352db447368a872e3871f4cab4553c27a222e
Author: Aldy Hernandez <aldyh@redhat.com>
Date:   Tue Nov 24 17:23:45 2020 +0100

    wip wip

Diff:
---
 gcc/tree-ssa-dom.c        | 4 ++--
 gcc/tree-ssa-threadedge.c | 4 ++--
 gcc/tree-ssa-threadedge.h | 4 ++--
 gcc/tree-vrp.c            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 514a7a5e9f9..6b45effc770 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -748,8 +748,8 @@ pass_dominator::execute (function *fun)
   /* Recursively walk the dominator tree optimizing statements.  */
   evrp_range_analyzer analyzer (true);
   dom_jump_threader_simplifier simplifier (&analyzer, avail_exprs_stack);
-  jump_threader threader (const_and_copies, avail_exprs_stack, &analyzer,
-			  &simplifier);
+  jump_threader threader (const_and_copies, avail_exprs_stack,
+			  &simplifier, &analyzer);
   dom_opt_dom_walker walker (CDI_DOMINATORS,
 			     &threader,
 			     &analyzer,
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index 8a0849243f6..190decd0f6c 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -63,8 +63,8 @@ set_ssa_name_value (tree name, tree value)
 
 jump_threader::jump_threader (const_and_copies *copies,
 			      avail_exprs_stack *avails,
-			      evrp_range_analyzer *analyzer,
-			      jump_threader_simplifier *simplifier)
+			      jump_threader_simplifier *simplifier,
+			      evrp_range_analyzer *analyzer)
 {
   /* Initialize the per SSA_NAME value-handles array.  */
   gcc_assert (!ssa_name_values.exists ());
diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
index 059fcc4a233..c4d52b69219 100644
--- a/gcc/tree-ssa-threadedge.h
+++ b/gcc/tree-ssa-threadedge.h
@@ -38,8 +38,8 @@ class jump_threader
 public:
   jump_threader (const_and_copies *,
 		 avail_exprs_stack *,
-		 evrp_range_analyzer *,
-		 jump_threader_simplifier *);
+		 jump_threader_simplifier *,
+  		 evrp_range_analyzer * = NULL);
   ~jump_threader ();
   // Entry point to calculate and register threadable paths.
   void thread_outgoing_edges (basic_block);
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index e0b9d402af8..68a6cfa7eb1 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -4277,7 +4277,7 @@ vrp_jump_threader::vrp_jump_threader (struct function *fun, vr_values *v)
   m_simplifier = new vrp_jump_threader_simplifier (m_vr_values,
 						   m_avail_exprs_stack);
   m_threader = new jump_threader (m_const_and_copies, m_avail_exprs_stack,
-				  NULL, m_simplifier);
+				  m_simplifier);
 }
 
 vrp_jump_threader::~vrp_jump_threader ()