flow.c (update_life_info, [...]): Fixed latent bug that could happen if update_life_info was called with a blocks...

2005-12-17  Kenneth Zadeck <zadeck@naturalbridge.com>

        * flow.c (update_life_info, count_or_remove_death_notes): Fixed
	latent bug that could happen if update_life_info was called with a
	blocks parameter and the call to cleanup_cfg actually deleted one
	of those blocks.

From-SVN: r108777

1 files changed, 15 insertions, 7 deletions

diff --git a/gcc/flow.c b/gcc/flow.c
index 436bfd7..ca2f1e1 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -658,12 +658,16 @@ update_life_info (sbitmap blocks, enum update_life_extent extent,
       EXECUTE_IF_SET_IN_SBITMAP (blocks, 0, i, sbi)
 	{
 	  bb = BASIC_BLOCK (i);
-
-	  COPY_REG_SET (tmp, bb->il.rtl->global_live_at_end);
-	  propagate_block (bb, tmp, NULL, NULL, stabilized_prop_flags);
-
-	  if (extent == UPDATE_LIFE_LOCAL)
-	    verify_local_live_at_start (tmp, bb);
+	  if (bb)
+	    {
+	      /* The bitmap may be flawed in that one of the basic
+		 blocks may have been deleted before you get here.  */
+	      COPY_REG_SET (tmp, bb->il.rtl->global_live_at_end);
+	      propagate_block (bb, tmp, NULL, NULL, stabilized_prop_flags);
+	      
+	      if (extent == UPDATE_LIFE_LOCAL)
+		verify_local_live_at_start (tmp, bb);
+	    }
 	};
     }
   else
@@ -4456,7 +4460,11 @@ count_or_remove_death_notes (sbitmap blocks, int kill)
 
       EXECUTE_IF_SET_IN_SBITMAP (blocks, 0, i, sbi)
 	{
-	  count += count_or_remove_death_notes_bb (BASIC_BLOCK (i), kill);
+	  basic_block bb = BASIC_BLOCK (i);
+	  /* The bitmap may be flawed in that one of the basic blocks
+	     may have been deleted before you get here.  */
+	  if (bb)
+	    count += count_or_remove_death_notes_bb (bb, kill);
 	};
     }
   else