flow.c (try_merge_block): Rename to try_optimize_cfg; do basic simplifications on the CFG.

	* flow.c (try_merge_block): Rename to try_optimize_cfg;
	do basic simplifications on the CFG.
	(is_forwarder_block_p, can_fallthru, try_redirect_by_replacing_jump,
	 try_simplify_condjump): New.
	(redirect_edge_and_branch): Try replace jump insn.
	(flow_delete_insn): Handle deleting of ADDR_VEC insns.

	* basic-block.h (FALLTHRU_EDGE, BRANCH_EDGE): New macros.

From-SVN: r43642

gcc/ChangeLog

+Thu Jun 28 20:13:11 CEST 2001  Jan Hubicka  <jh@suse.cz>
+
+	* flow.c (try_merge_block): Rename to try_optimize_cfg;
+	do basic simplifications on the CFG.
+	(is_forwarder_block_p, can_fallthru, try_redirect_by_replacing_jump,
+	 try_simplify_condjump): New.
+	(redirect_edge_and_branch): Try replace jump insn.
+	(flow_delete_insn): Handle deleting of ADDR_VEC insns.
+
+	* basic-block.h (FALLTHRU_EDGE, BRANCH_EDGE): New macros.
+
 Thu Jun 28 11:19:42 2001  Jeffrey A Law  (law@cygnus.com)
 
 	* ssa-dce.c (eliminate_dead_code): Remove fake edges from the

gcc/basic-block.h

@@ -488,6 +488,14 @@ struct edge_list
 /* Number of edges in the compressed edge list.  */
 #define NUM_EDGES(el)			((el)->num_edges)
 
+/* BB is assumed to contain conditional jump.  Return the fallthru edge.  */
+#define FALLTHRU_EDGE(bb)		((bb)->succ->flags & EDGE_FALLTHRU \
+					 ? (bb)->succ : (bb)->succ->succ_next)
+
+/* BB is assumed to contain conditional jump.  Return the branch edge.  */
+#define BRANCH_EDGE(bb)			((bb)->succ->flags & EDGE_FALLTHRU \
+					 ? (bb)->succ->succ_next : (bb)->succ)
+
 struct edge_list * create_edge_list	PARAMS ((void));
 void free_edge_list			PARAMS ((struct edge_list *));
 void print_edge_list			PARAMS ((FILE *, struct edge_list *));