diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ea850a5a8dc..a5d19e6bc69 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-29  Michael Meissner  <michael.meissner@amd.com>
+
+	PR 35004
+	* cp-tree.h (struct full_lang_decl): Make tree_code bitfield 16
+	bits to allow for expansion of the number of middle end tree
+	codes.
+
 2008-01-29  Douglas Gregor  <doug.gregor@gmail.com>
 
 	PR c++/34055
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 5f43c13d3d8..e6aba2fe2c4 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1655,11 +1655,11 @@ struct lang_decl GTY(())
       {
 	/* In an overloaded operator, this is the value of
 	   DECL_OVERLOADED_OPERATOR_P.  */
-	ENUM_BITFIELD (tree_code) operator_code : 8;
+	ENUM_BITFIELD (tree_code) operator_code : 16;
 
 	unsigned u3sel : 1;
 	unsigned pending_inline_p : 1;
-	unsigned spare : 22;
+	unsigned spare : 14;
 
 	/* For a non-thunk function decl, this is a tree list of
 	   friendly classes. For a thunk function decl, it is the