diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/rtti.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 149516c..9b78a29 100644 --- 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 02272e8..f185cc5 100644 --- 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); |