diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b190b48694b48458370a562b6c280da15e2e0de..f2db22542c660124d59741e796957093b14cb6e4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-21  Richard Guenther  <rguenther@suse.de>
+
+	* ggc-page.c (extra_order_size_table): Add var_ann_d,
+	tree_ssa_name, bitmap_element and phi_node with 4 arguments
+	sizes.
+
 2006-06-21  Richrad Guenther  <rguenther@suse.de>
 
 	* tree-ssa-loop-niter.c (simplify_using_initial_conditions):
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index 7b1415b785fab75fe59f942855af2a1bbe393943..58c5355c7731d22604966dd1109ca58ba9ff2977 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -186,13 +186,19 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 
 static const size_t extra_order_size_table[] = {
   sizeof (struct stmt_ann_d),
+  sizeof (struct var_ann_d),
   sizeof (struct tree_decl_non_common),
   sizeof (struct tree_field_decl),
   sizeof (struct tree_parm_decl),
   sizeof (struct tree_var_decl),
   sizeof (struct tree_list),
+  sizeof (struct tree_ssa_name),
   sizeof (struct function),
   sizeof (struct basic_block_def),
+  sizeof (bitmap_element),
+  /* PHI nodes with one to three arguments are already covered by the
+     above sizes.  */
+  sizeof (struct tree_phi_node) + sizeof (struct phi_arg_d) * 3,
   TREE_EXP_SIZE (2),
   RTL_SIZE (2),			/* MEM, PLUS, etc.  */
   RTL_SIZE (9),			/* INSN */