diff mbox

[gimple-classes,committed,11/92] tree-predcom.c: use gimple_phi in various places

Message ID 1414442490-14841-12-git-send-email-dmalcolm@redhat.com
State New
Headers show

Commit Message

David Malcolm Oct. 27, 2014, 8:40 p.m. UTC 
This corresponds to:
  [PATCH 12/89] tree-predcom.c: use gimple_phi in various places
  https://gcc.gnu.org/ml/gcc-patches/2014-04/msg01229.html
from the original 89-patch kit

That earlier patch was approved by Jeff:
> OK when prerequisites have gone in.
in https://gcc.gnu.org/ml/gcc-patches/2014-05/msg00621.html

gcc/
	* tree-predcom.c (find_looparound_phi): Return a gimple_phi rather
	than just a gimple.
	(insert_looparound_copy): Require a gimple_phi rather than just a
	gimple.
	(add_looparound_copies): Convert local "phi" to be a gimple_phi.
	(initialize_root_vars): Likewise.
	(initialize_root_vars_lm): Likewise.
---
 gcc/ChangeLog.gimple-classes | 12 ++++++++++++
 gcc/tree-predcom.c           | 10 +++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/gcc/ChangeLog.gimple-classes b/gcc/ChangeLog.gimple-classes
index fb4c222..0e6a5d9 100644
--- a/gcc/ChangeLog.gimple-classes
+++ b/gcc/ChangeLog.gimple-classes
@@ -1,5 +1,17 @@ 
 2014-10-24  David Malcolm  <dmalcolm@redhat.com>
 
+	tree-predcom.c: use gimple_phi in various places
+
+	* tree-predcom.c (find_looparound_phi): Return a gimple_phi rather
+	than just a gimple.
+	(insert_looparound_copy): Require a gimple_phi rather than just a
+	gimple.
+	(add_looparound_copies): Convert local "phi" to be a gimple_phi.
+	(initialize_root_vars): Likewise.
+	(initialize_root_vars_lm): Likewise.
+
+2014-10-24  David Malcolm  <dmalcolm@redhat.com>
+
 	tree-parloops.c: use gimple_phi in various places
 
 	* tree-parloops.c (struct reduction_info): Strengthen field "new_phi"
diff --git a/gcc/tree-predcom.c b/gcc/tree-predcom.c
index 0ce81aa..dfda10e 100644
--- a/gcc/tree-predcom.c
+++ b/gcc/tree-predcom.c
@@ -1112,7 +1112,7 @@  valid_initializer_p (struct data_reference *ref,
    iteration), returns the phi node.  Otherwise, NULL_TREE is returned.  ROOT
    is the root of the current chain.  */
 
-static gimple
+static gimple_phi
 find_looparound_phi (struct loop *loop, dref ref, dref root)
 {
   tree name, init, init_ref;
@@ -1174,7 +1174,7 @@  find_looparound_phi (struct loop *loop, dref ref, dref root)
 /* Adds a reference for the looparound copy of REF in PHI to CHAIN.  */
 
 static void
-insert_looparound_copy (chain_p chain, dref ref, gimple phi)
+insert_looparound_copy (chain_p chain, dref ref, gimple_phi phi)
 {
   dref nw = XCNEW (struct dref_d), aref;
   unsigned i;
@@ -1205,7 +1205,7 @@  add_looparound_copies (struct loop *loop, chain_p chain)
 {
   unsigned i;
   dref ref, root = get_chain_root (chain);
-  gimple phi;
+  gimple_phi phi;
 
   FOR_EACH_VEC_ELT (chain->refs, i, ref)
     {
@@ -1457,7 +1457,7 @@  initialize_root_vars (struct loop *loop, chain_p chain, bitmap tmp_vars)
   dref root = get_chain_root (chain);
   bool reuse_first = !chain->has_max_use_after;
   tree ref, init, var, next;
-  gimple phi;
+  gimple_phi phi;
   gimple_seq stmts;
   edge entry = loop_preheader_edge (loop), latch = loop_latch_edge (loop);
 
@@ -1531,7 +1531,7 @@  initialize_root_vars_lm (struct loop *loop, dref root, bool written,
   unsigned i;
   tree ref = DR_REF (root->ref), init, var, next;
   gimple_seq stmts;
-  gimple phi;
+  gimple_phi phi;
   edge entry = loop_preheader_edge (loop), latch = loop_latch_edge (loop);
 
   /* Find the initializer for the variable, and check that it cannot