diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fe0fc87fbc5..bea45a1ff88 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-31  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	* mode-switching.c (optimize_mode_switching): Fix size
+	allocated for bb_info[n_entities].
+
 2006-01-31  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	* gcc.c (main): Correct type that is allocated for
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index 9d7989f4fc9..c225d6a9647 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -415,7 +415,7 @@ optimize_mode_switching (FILE *file)
 	entry_exit_extra = 3;
 #endif
 	bb_info[n_entities]
-	  = XCNEWVEC (struct bb_info, last_basic_block);
+	  = XCNEWVEC (struct bb_info, last_basic_block + entry_exit_extra);
 	entity_map[n_entities++] = e;
 	if (num_modes[e] > max_num_modes)
 	  max_num_modes = num_modes[e];