diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6b970756d4a..52763df55ad 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-03  Mumit Khan  <khan@nanotech.wisc.edu>
+
+	PR c++/3394
+	*  decl.c (xref_basetypes): Handle attributes between 
+	  'class' and name.
+
 2001-12-03  Nathan Sidwell  <nathan@codesourcery.com>
 
 	PR g++/3381
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index c10a0c7c1c7..74e829abd61 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -12849,6 +12849,14 @@ xref_basetypes (code_type_node, name, ref, binfo)
   tree base;
 
   int i, len;
+
+  /* If we are called from the parser, code_type_node will sometimes be a
+     TREE_LIST.  This indicates that the user wrote
+     "class __attribute__ ((foo)) bar".  Extract the attributes so that
+     tree_low_cst doesn't crash.  */
+  if (TREE_CODE (code_type_node) == TREE_LIST)
+    code_type_node = TREE_VALUE (code_type_node);
+
   enum tag_types tag_code = (enum tag_types) tree_low_cst (code_type_node, 1);
 
   if (tag_code == union_type)