decl2.c (handle_class_head): Bash typedefs to the type's main decl.

* decl2.c (handle_class_head): Bash typedefs to the type's main decl. From-SVN: r34707

decl2.c (handle_class_head): Bash typedefs to the type's main decl.
* decl2.c (handle_class_head): Bash typedefs to the type's main decl. From-SVN: r34707
0404d86f · Nathan Sidwell · Nathan Sidwell · 24b55e3a · 0404d86f · 0404d86f
Commit 0404d86f authored Jun 26, 2000 by Nathan Sidwell Committed by Nathan Sidwell Jun 26, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletions

gcc/cp/ChangeLog
+5 -0

gcc/cp/decl2.c
+3 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+2000-06-26  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* decl2.c (handle_class_head): Bash typedefs to the type's main
+	decl.
+
 2000-06-25  Mark Mitchell  <mark@codesourcery.com>

 	* cp-tree.h (genrtl_begin_stmt_expr): Rename to ...

--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -5362,7 +5362,9 @@ handle_class_head (aggr, scope, id)
  tree decl;

  if (TREE_CODE (id) == TYPE_DECL)
-    decl = id;
+    /* We must bash typedefs back to the main decl of the type. Otherwise
+       we become confused about scopes.  */
+    decl = TYPE_MAIN_DECL (TREE_TYPE (id));
  else if (DECL_CLASS_TEMPLATE_P (id))
    decl = DECL_TEMPLATE_RESULT (id);
  else