diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bd78f583278f7323f11950a51a0d1f432e3a415b..00892e968054519c2df5a4644ec940b2b041e8a4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-05  Dirk Mueller  <dmueller@suse.de>
+
+	PR bootstrap/30510
+	* parser.c (cp_parser_class_specifier): Always initialize bases.
+
 2007-02-05  Paolo Bonzini  <bonzini@gnu.org>
 
 	* cp-tree.h (OMP_ATOMIC_CODE): Delete.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index f7bff071a6a43637eaf02c92359ddab33ca9ecbb..6aef931fc7db40a912e4f411902ced88a0cbc8a8 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -13398,6 +13398,10 @@ cp_parser_class_specifier (cp_parser* parser)
      class-key attributes nested-name-specifier [opt] template-id
        base-clause [opt]
 
+   Upon return BASES is initialized to the list of base classes (or
+   NULL, if there are none) in the same form returned by
+   cp_parser_base_clause.
+
    Returns the TYPE of the indicated class.  Sets
    *NESTED_NAME_SPECIFIER_P to TRUE iff one of the productions
    involving a nested-name-specifier was used, and FALSE otherwise.
@@ -13432,6 +13436,8 @@ cp_parser_class_head (cp_parser* parser,
      type.  */
   num_templates = 0;
 
+  *bases = NULL_TREE;
+
   /* Look for the class-key.  */
   class_key = cp_parser_class_key (parser);
   if (class_key == none_type)
@@ -13722,7 +13728,6 @@ cp_parser_class_head (cp_parser* parser,
        struct A::C : B {};
 
      is valid.  */
-  *bases = NULL_TREE;
 
   /* Get the list of base-classes, if there is one.  */
   if (cp_lexer_next_token_is (parser->lexer, CPP_COLON))