1 files changed, 136 insertions, 91 deletions

diff --git a/gcc/gimple-iterator.c b/gcc/gimple-iterator.c
index e387c16e31a..0f1d4975961 100644
--- a/gcc/gimple-iterator.c
+++ b/gcc/gimple-iterator.c
@@ -57,12 +57,17 @@ update_modified_stmts (gimple_seq seq)
    starting at FIRST and LAST.  */
 
 static void
-update_bb_for_stmts (gimple_seq_node first, basic_block bb)
+update_bb_for_stmts (gimple_seq_node first, gimple_seq_node last,
+		     basic_block bb)
 {
   gimple_seq_node n;
 
-  for (n = first; n; n = n->next)
-    gimple_set_bb (n->stmt, bb);
+  for (n = first; n; n = n->gsbase.next)
+    {
+      gimple_set_bb (n, bb);
+      if (n == last)
+	break;
+    }
 }
 
 /* Set the frequencies for the cgraph_edges for each of the calls
@@ -75,8 +80,8 @@ update_call_edge_frequencies (gimple_seq_node first, basic_block bb)
   int bb_freq = 0;
   gimple_seq_node n;
 
-  for (n = first; n ; n = n->next)
-    if (is_gimple_call (n->stmt))
+  for (n = first; n ; n = n->gsbase.next)
+    if (is_gimple_call (n))
       {
 	struct cgraph_edge *e;
 
@@ -89,7 +94,7 @@ update_call_edge_frequencies (gimple_seq_node first, basic_block bb)
 		       (current_function_decl, bb));
 	  }
 
-	e = cgraph_edge (cfun_node, n->stmt);
+	e = cgraph_edge (cfun_node, n);
 	if (e != NULL)
 	  e->frequency = bb_freq;
       }
@@ -113,32 +118,37 @@ gsi_insert_seq_nodes_before (gimple_stmt_iterator *i,
   basic_block bb;
   gimple_seq_node cur = i->ptr;
 
+  gcc_assert (!cur || cur->gsbase.prev);
+
   if ((bb = gsi_bb (*i)) != NULL)
-    update_bb_for_stmts (first, bb);
+    update_bb_for_stmts (first, last, bb);
 
   /* Link SEQ before CUR in the sequence.  */
   if (cur)
     {
-      first->prev = cur->prev;
-      if (first->prev)
-	first->prev->next = first;
+      first->gsbase.prev = cur->gsbase.prev;
+      if (first->gsbase.prev->gsbase.next)
+	first->gsbase.prev->gsbase.next = first;
       else
 	gimple_seq_set_first (i->seq, first);
-      last->next = cur;
-      cur->prev = last;
+      last->gsbase.next = cur;
+      cur->gsbase.prev = last;
     }
   else
     {
-      gimple_seq_node itlast = gimple_seq_last (i->seq);
+      gimple_seq_node itlast = gimple_seq_last (*i->seq);
 
       /* If CUR is NULL, we link at the end of the sequence (this case happens
 	 when gsi_after_labels is called for a basic block that contains only
 	 labels, so it returns an iterator after the end of the block, and
 	 we need to insert before it; it might be cleaner to add a flag to the
 	 iterator saying whether we are at the start or end of the list).  */
-      first->prev = itlast;
+      last->gsbase.next = NULL;
       if (itlast)
-	itlast->next = first;
+	{
+	  first->gsbase.prev = itlast;
+	  itlast->gsbase.next = first;
+	}
       else
 	gimple_seq_set_first (i->seq, first);
       gimple_seq_set_last (i->seq, last);
@@ -178,15 +188,11 @@ gsi_insert_seq_before_without_update (gimple_stmt_iterator *i, gimple_seq seq,
     return;
 
   /* Don't allow inserting a sequence into itself.  */
-  gcc_assert (seq != i->seq);
+  gcc_assert (seq != *i->seq);
 
   first = gimple_seq_first (seq);
   last = gimple_seq_last (seq);
 
-  gimple_seq_set_first (seq, NULL);
-  gimple_seq_set_last (seq, NULL);
-  gimple_seq_free (seq);
-
   /* Empty sequences need no work.  */
   if (!first || !last)
     {
@@ -230,25 +236,30 @@ gsi_insert_seq_nodes_after (gimple_stmt_iterator *i,
   basic_block bb;
   gimple_seq_node cur = i->ptr;
 
+  gcc_assert (!cur || cur->gsbase.prev);
+
   /* If the iterator is inside a basic block, we need to update the
      basic block information for all the nodes between FIRST and LAST.  */
   if ((bb = gsi_bb (*i)) != NULL)
-    update_bb_for_stmts (first, bb);
+    update_bb_for_stmts (first, last, bb);
 
   /* Link SEQ after CUR.  */
   if (cur)
     {
-      last->next = cur->next;
-      if (last->next)
-	last->next->prev = last;
+      last->gsbase.next = cur->gsbase.next;
+      if (last->gsbase.next)
+	{
+	  last->gsbase.next->gsbase.prev = last;
+	}
       else
 	gimple_seq_set_last (i->seq, last);
-      first->prev = cur;
-      cur->next = first;
+      first->gsbase.prev = cur;
+      cur->gsbase.next = first;
     }
   else
     {
-      gcc_assert (!gimple_seq_last (i->seq));
+      gcc_assert (!gimple_seq_last (*i->seq));
+      last->gsbase.next = NULL;
       gimple_seq_set_first (i->seq, first);
       gimple_seq_set_last (i->seq, last);
     }
@@ -289,15 +300,11 @@ gsi_insert_seq_after_without_update (gimple_stmt_iterator *i, gimple_seq seq,
     return;
 
   /* Don't allow inserting a sequence into itself.  */
-  gcc_assert (seq != i->seq);
+  gcc_assert (seq != *i->seq);
 
   first = gimple_seq_first (seq);
   last = gimple_seq_last (seq);
 
-  gimple_seq_set_first (seq, NULL);
-  gimple_seq_set_last (seq, NULL);
-  gimple_seq_free (seq);
-
   /* Empty sequences need no work.  */
   if (!first || !last)
     {
@@ -329,59 +336,81 @@ gimple_seq
 gsi_split_seq_after (gimple_stmt_iterator i)
 {
   gimple_seq_node cur, next;
-  gimple_seq old_seq, new_seq;
+  gimple_seq *pold_seq, new_seq;
 
   cur = i.ptr;
 
   /* How can we possibly split after the end, or before the beginning?  */
-  gcc_assert (cur && cur->next);
-  next = cur->next;
+  gcc_assert (cur && cur->gsbase.next);
+  next = cur->gsbase.next;
 
-  old_seq = i.seq;
-  new_seq = gimple_seq_alloc ();
+  pold_seq = i.seq;
 
-  gimple_seq_set_first (new_seq, next);
-  gimple_seq_set_last (new_seq, gimple_seq_last (old_seq));
-  gimple_seq_set_last (old_seq, cur);
-  cur->next = NULL;
-  next->prev = NULL;
+  gimple_seq_set_first (&new_seq, next);
+  gimple_seq_set_last (&new_seq, gimple_seq_last (*pold_seq));
+  gimple_seq_set_last (pold_seq, cur);
+  cur->gsbase.next = NULL;
 
   return new_seq;
 }
 
 
+/* Set the statement to which GSI points to STMT.  This only updates
+   the iterator and the gimple sequence, it doesn't do the bookkeeping
+   of gsi_replace.  */
+
+void
+gsi_set_stmt (gimple_stmt_iterator *gsi, gimple stmt)
+{
+  gimple orig_stmt = gsi_stmt (*gsi);
+  gimple prev, next;
+
+  stmt->gsbase.next = next = orig_stmt->gsbase.next;
+  stmt->gsbase.prev = prev = orig_stmt->gsbase.prev;
+  /* Note how we don't clear next/prev of orig_stmt.  This is so that
+     copies of *GSI our callers might still hold (to orig_stmt)
+     can be advanced as if they too were replaced.  */
+  if (prev->gsbase.next)
+    prev->gsbase.next = stmt;
+  else
+    gimple_seq_set_first (gsi->seq, stmt);
+  if (next)
+    next->gsbase.prev = stmt;
+  else
+    gimple_seq_set_last (gsi->seq, stmt);
+
+  gsi->ptr = stmt;
+}
+
+
 /* Move all statements in the sequence before I to a new sequence.
    Return this new sequence.  I is set to the head of the new list.  */
 
-gimple_seq
-gsi_split_seq_before (gimple_stmt_iterator *i)
+void
+gsi_split_seq_before (gimple_stmt_iterator *i, gimple_seq *pnew_seq)
 {
   gimple_seq_node cur, prev;
-  gimple_seq old_seq, new_seq;
+  gimple_seq old_seq;
 
   cur = i->ptr;
 
   /* How can we possibly split after the end?  */
   gcc_assert (cur);
-  prev = cur->prev;
+  prev = cur->gsbase.prev;
 
-  old_seq = i->seq;
-  new_seq = gimple_seq_alloc ();
-  i->seq = new_seq;
+  old_seq = *i->seq;
+  if (!prev->gsbase.next)
+    *i->seq = NULL;
+  i->seq = pnew_seq;
 
   /* Set the limits on NEW_SEQ.  */
-  gimple_seq_set_first (new_seq, cur);
-  gimple_seq_set_last (new_seq, gimple_seq_last (old_seq));
+  gimple_seq_set_first (pnew_seq, cur);
+  gimple_seq_set_last (pnew_seq, gimple_seq_last (old_seq));
 
   /* Cut OLD_SEQ before I.  */
-  gimple_seq_set_last (old_seq, prev);
-  cur->prev = NULL;
-  if (prev)
-    prev->next = NULL;
-  else
-    gimple_seq_set_first (old_seq, NULL);
-
-  return new_seq;
+  gimple_seq_set_last (&old_seq, prev);
+  if (prev->gsbase.next)
+    prev->gsbase.next = NULL;
 }
 
 
@@ -416,12 +445,38 @@ gsi_replace (gimple_stmt_iterator *gsi, gimple stmt, bool update_eh_info)
   gimple_remove_stmt_histograms (cfun, orig_stmt);
   delink_stmt_imm_use (orig_stmt);
 
-  *gsi_stmt_ptr (gsi) = stmt;
+  gsi_set_stmt (gsi, stmt);
   gimple_set_modified (stmt, true);
   update_modified_stmt (stmt);
 }
 
 
+/* Replace the statement pointed-to by GSI with the sequence SEQ.
+   If UPDATE_EH_INFO is true, the exception handling information of
+   the original statement is moved to the last statement of the new
+   sequence.  If the old statement is an assignment, then so must
+   be the last statement of the new sequence, and they must have the
+   same LHS.  */
+
+void
+gsi_replace_with_seq (gimple_stmt_iterator *gsi, gimple_seq seq,
+		      bool update_eh_info)
+{
+  gimple_stmt_iterator seqi;
+  gimple last;
+  if (gimple_seq_empty_p (seq))
+    {
+      gsi_remove (gsi, true);
+      return;
+    }
+  seqi = gsi_last (seq);
+  last = gsi_stmt (seqi);
+  gsi_remove (&seqi, false);
+  gsi_insert_seq_before (gsi, seq, GSI_SAME_STMT);
+  gsi_replace (gsi, last, update_eh_info);
+}
+
+
 /* Insert statement STMT before the statement pointed-to by iterator I.
    M specifies how to update iterator I after insertion (see enum
    gsi_iterator_update).
@@ -435,12 +490,7 @@ void
 gsi_insert_before_without_update (gimple_stmt_iterator *i, gimple stmt,
                                   enum gsi_iterator_update m)
 {
-  gimple_seq_node n;
-
-  n = ggc_alloc_gimple_seq_node_d ();
-  n->prev = n->next = NULL;
-  n->stmt = stmt;
-  gsi_insert_seq_nodes_before (i, n, n, m);
+  gsi_insert_seq_nodes_before (i, stmt, stmt, m);
 }
 
 /* Insert statement STMT before the statement pointed-to by iterator I.
@@ -470,12 +520,7 @@ void
 gsi_insert_after_without_update (gimple_stmt_iterator *i, gimple stmt,
                                  enum gsi_iterator_update m)
 {
-  gimple_seq_node n;
-
-  n = ggc_alloc_gimple_seq_node_d ();
-  n->prev = n->next = NULL;
-  n->stmt = stmt;
-  gsi_insert_seq_nodes_after (i, n, n, m);
+  gsi_insert_seq_nodes_after (i, stmt, stmt, m);
 }
 
 
@@ -525,19 +570,24 @@ gsi_remove (gimple_stmt_iterator *i, bool remove_permanently)
 
   /* Update the iterator and re-wire the links in I->SEQ.  */
   cur = i->ptr;
-  next = cur->next;
-  prev = cur->prev;
-
-  if (prev)
-    prev->next = next;
-  else
-    gimple_seq_set_first (i->seq, next);
+  next = cur->gsbase.next;
+  prev = cur->gsbase.prev;
+  /* See gsi_set_stmt for why we don't reset prev/next of STMT.  */
 
   if (next)
-    next->prev = prev;
-  else
+    /* Cur is not last.  */
+    next->gsbase.prev = prev;
+  else if (prev->gsbase.next)
+    /* Cur is last but not first.  */
     gimple_seq_set_last (i->seq, prev);
 
+  if (prev->gsbase.next)
+    /* Cur is not first.  */
+    prev->gsbase.next = next;
+  else
+    /* Cur is first.  */
+    *i->seq = next;
+
   i->ptr = next;
 
   return require_eh_edge_purge;
@@ -557,11 +607,8 @@ gsi_for_stmt (gimple stmt)
   else
     i = gsi_start_bb (bb);
 
-  for (; !gsi_end_p (i); gsi_next (&i))
-    if (gsi_stmt (i) == stmt)
-      return i;
-
-  gcc_unreachable ();
+  i.ptr = stmt;
+  return i;
 }
 
 
@@ -727,7 +774,6 @@ basic_block
 gsi_insert_on_edge_immediate (edge e, gimple stmt)
 {
   gimple_stmt_iterator gsi;
-  struct gimple_seq_node_d node;
   basic_block new_bb = NULL;
   bool ins_after;
 
@@ -735,9 +781,7 @@ gsi_insert_on_edge_immediate (edge e, gimple stmt)
 
   ins_after = gimple_find_edge_insert_loc (e, &gsi, &new_bb);
 
-  node.stmt = stmt;
-  node.prev = node.next = NULL;
-  update_call_edge_frequencies (&node, gsi.bb);
+  update_call_edge_frequencies (stmt, gsi.bb);
 
   if (ins_after)
     gsi_insert_after (&gsi, stmt, GSI_NEW_STMT);
@@ -820,5 +864,6 @@ gsi_commit_one_edge_insert (edge e, basic_block *new_bb)
 gimple_stmt_iterator
 gsi_start_phis (basic_block bb)
 {
-  return gsi_start (phi_nodes (bb));
+  gimple_seq *pseq = phi_nodes_ptr (bb);
+  return gsi_start_1 (pseq);
 }