rtti.c (get_tinfo_decl): Handle return value from pushdecl_top_level_and_finish.

	* rtti.c (get_tinfo_decl): Handle return value from
	pushdecl_top_level_and_finish.

From-SVN: r119379

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 149516cd9052f77ab6db13a98a891647d8cd48fe..9b78a29fdf740e581aa0fa053c09c97684449901 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-30  Geoffrey Keating  <geoffk@apple.com>
+
+       * rtti.c (get_tinfo_decl): Handle return value from
+       pushdecl_top_level_and_finish.
+
 2006-11-29  Lee Millward  <lee.millward@codesourcery.com> 
 
        PR c++/29022

diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 02272e84ee3ba0ca59ef80fa60b492ba24932e94..f185cc5c6a9d822a977d148039e6e2e0ae077e16 100644 (file)
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -384,10 +384,11 @@ get_tinfo_decl (tree type)
         define it later if we need to do so.  */
       DECL_EXTERNAL (d) = 1;
       DECL_NOT_REALLY_EXTERN (d) = 1;
+      set_linkage_according_to_type (type, d);
+
+      d = pushdecl_top_level_and_finish (d, NULL_TREE);
       if (CLASS_TYPE_P (type))
        CLASSTYPE_TYPEINFO_VAR (TYPE_MAIN_VARIANT (type)) = d;
-      set_linkage_according_to_type (type, d);
-      pushdecl_top_level_and_finish (d, NULL_TREE);
 
       /* Add decl to the global array of tinfo decls.  */
       VEC_safe_push (tree, gc, unemitted_tinfo_decls, d);