* tree-flow.h (const_block_stmt_iterator): Remove.

	Update all users to use block_stmt_iterator.
	* tree-iterator.h (const_tree_stmt_iterator): Remove.
	Update all users to use tree_stmt_iterator.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128246 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 10 insertions, 8 deletions

diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index c3dcf33521f..d001a7a86bf 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -294,21 +294,23 @@ blocks_in_phiopt_order (void)
 #undef VISITED_P
 }
 
+
 /* Return TRUE if block BB has no executable statements, otherwise return
    FALSE.  */
+
 bool
-empty_block_p (const_basic_block bb)
+empty_block_p (basic_block bb)
 {
-  const_block_stmt_iterator bsi;
+  block_stmt_iterator bsi;
 
   /* BB must have no executable statements.  */
-  bsi = cbsi_start (bb);
-  while (!cbsi_end_p (bsi)
-	  && (TREE_CODE (cbsi_stmt (bsi)) == LABEL_EXPR
-	      || IS_EMPTY_STMT (cbsi_stmt (bsi))))
-    cbsi_next (&bsi);
+  bsi = bsi_start (bb);
+  while (!bsi_end_p (bsi)
+	  && (TREE_CODE (bsi_stmt (bsi)) == LABEL_EXPR
+	      || IS_EMPTY_STMT (bsi_stmt (bsi))))
+    bsi_next (&bsi);
 
-  if (!cbsi_end_p (bsi))
+  if (!bsi_end_p (bsi))
     return false;
 
   return true;