OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert last checkin 

From-SVN: r53457
This commit is contained in:
Jason Merrill 2002-05-14 10:14:43 -04:00
parent 4d604303a6
commit affb23402d
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -5,10 +5,6 @@
(build_base_path): Vtable contents are constant.
* typeck.c (get_member_function_from_ptrfunc): Likewise.
* rtti.c (emit_tinfo_decl): Call import_export_decl.
* decl2.c (import_export_decl): Set DECL_NOT_REALLY_EXTERN on
tinfo decls by default. Don't mess with the builtins.
2002-05-12 Jason Merrill <jason@redhat.com>
* cp-lang.c (ok_to_generate_alias_set_for_type): Backend-created

7
gcc/cp/decl2.c
View File

@ -2514,7 +2514,6 @@ import_export_decl (decl)
if (IS_AGGR_TYPE (ctype))
import_export_class (ctype);
DECL_NOT_REALLY_EXTERN (decl) = 1;
if (IS_AGGR_TYPE (ctype) && CLASSTYPE_INTERFACE_KNOWN (ctype)
&& TYPE_POLYMORPHIC_P (ctype)
/* If -fno-rtti, we're not necessarily emitting this stuff with
@ -2538,9 +2537,9 @@ import_export_decl (decl)
if (flag_weak)
comdat_linkage (decl);
}
/* We used to exclude the builtin types here, but that broke
emit_support_tinfos. Let rtti.c choose whether or not to emit
them. */
else if (TYPE_BUILT_IN (ctype)
&& same_type_p (ctype, TYPE_MAIN_VARIANT (ctype)))
DECL_NOT_REALLY_EXTERN (decl) = 0;
else
comdat_linkage (decl);
}

6
gcc/cp/rtti.c
View File

@ -1462,11 +1462,9 @@ emit_tinfo_decl (decl_ptr, data)
my_friendly_assert (TREE_TYPE (tinfo_decl) == tinfo_decl_type, 20000121);
tinfo_type = TREE_TYPE (DECL_NAME (tinfo_decl));
my_friendly_assert (tinfo_type != NULL_TREE, 20000120);
import_export_decl (tinfo_decl);
if (DECL_REALLY_EXTERN (tinfo_decl) || !DECL_NEEDED_P (tinfo_decl))
if (!DECL_NEEDED_P (tinfo_decl))
return 0;
/* Say we've dealt with it. */
TREE_TYPE (DECL_NAME (tinfo_decl)) = NULL_TREE;