re PR rtl-optimization/10024 ([HP-PA] inline optimization ICE)

	PR opt/10024
	* cfglayout.c (cfg_layout_redirect_edge):
	Redirect any branch edges unified with the fallthru one.
	* cfgrtl.c (force_nonfallthru_and_redirect):  Do not special
	case fallthru edges when called via cfglayout.c

From-SVN: r65330

gcc/ChangeLog

+Mon Apr  7 14:36:24 CEST 2003  Jan Hubicka  <jh@suse.cz>
+
+	PR opt/10024
+	* cfglayout.c (cfg_layout_redirect_edge):
+	Redirect any branch edges unified with the fallthru one.
+	* cfgrtl.c (force_nonfallthru_and_redirect):  Do not special
+	case fallthru edges when called via cfglayout.c
+
 2003-04-07  J"orn Rennecke <joern.rennecke@superh.com>
 
 	* c-typeck.c (output_init_element): Check for type == error_mark_node.

gcc/cfglayout.c

@@ -904,6 +904,13 @@ cfg_layout_redirect_edge (e, dest)
   src->next_bb = NULL;
   if (e->flags & EDGE_FALLTHRU)
     {
+      /* Redirect any branch edges unified with the fallthru one.  */
+      if (GET_CODE (src->end) == JUMP_INSN
+	  && JUMP_LABEL (src->end) == e->dest->head)
+	{
+          if (!redirect_jump (src->end, block_label (dest), 0))
+	    abort ();
+	}
       /* In case we are redirecting fallthru edge to the branch edge
          of conditional jump, remove it.  */
       if (src->succ->succ_next

gcc/cfgrtl.c

@@ -927,6 +927,9 @@ force_nonfallthru_and_redirect (e, target)
      by creating an basic block afterwards to redirect fallthru edge.  */
   if (e->src != ENTRY_BLOCK_PTR && e->dest != EXIT_BLOCK_PTR
       && any_condjump_p (e->src->end)
+      /* When called from cfglayout, fallthru edges do not
+         neccessarily go to the next block.  */
+      && e->src->next_bb == e->dest
       && JUMP_LABEL (e->src->end) == e->dest->head)
     {
       rtx note;