diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 30a83691cd9..5c55b1d99db 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/23506
+	* c-common.c (c_common_nodes_and_builtins): Increase builtin_types
+	array by one element, initialize the BT_LAST element with NULL.
+
 2005-08-26  David Edelsohn  <edelsohn@gnu.org>
 
 	* config/rs6000/rs6000.md (eq<mode>_compare): Only enable when
diff --git a/gcc/c-common.c b/gcc/c-common.c
index 678327779bf..edd744893cb 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -2951,7 +2951,7 @@ c_common_nodes_and_builtins (void)
 
   typedef enum builtin_type builtin_type;
 
-  tree builtin_types[(int) BT_LAST];
+  tree builtin_types[(int) BT_LAST + 1];
   int wchar_type_size;
   tree array_domain_type;
   tree va_list_ref_type_node;
@@ -3311,6 +3311,7 @@ c_common_nodes_and_builtins (void)
 #undef DEF_FUNCTION_TYPE_VAR_4
 #undef DEF_FUNCTION_TYPE_VAR_5
 #undef DEF_POINTER_TYPE
+  builtin_types[(int) BT_LAST] = NULL_TREE;
 
   c_init_attributes ();