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

ipa-devirt.c (odr_subtypes_equivalent_p): Compare TYPE_NAME only for aggregate types.

Browse Source 
* ipa-devirt.c (odr_subtypes_equivalent_p): Compare TYPE_NAME only
	for aggregate types.
	(register_odr_type): Be ready for MAIN_VARIANT of ODR type
	type to be non_ODR.
	* tree.c (need_assembler_name_p): Compute mangled name for
	non-fundamental types and integer types.

From-SVN: r222609
This commit is contained in:
Jan Hubicka 2015-04-30 06:43:32 +02:00 committed by Jan Hubicka
parent 00c1cf38e1
commit 32496fdde1
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2015-04-29 Jan Hubicka <hubicka@ucw.cz>
* ipa-devirt.c (odr_subtypes_equivalent_p): Compare TYPE_NAME only
for aggregate types.
(register_odr_type): Be ready for MAIN_VARIANT of ODR type
type to be non_ODR.
* tree.c (need_assembler_name_p): Compute mangled name for
non-fundamental types and integer types.
2015-04-29 Mikhail Maltsev <maltsevm@gmail.com>
* dojump.c (do_compare_rtx_and_jump): Use std::swap instead of

13
gcc/ipa-devirt.c
View File

@ -675,7 +675,8 @@ odr_subtypes_equivalent_p (tree t1, tree t2,
have to be compared structurally. */
if (TREE_CODE (t1) != TREE_CODE (t2))
return false;
if ((TYPE_NAME (t1) == NULL_TREE) != (TYPE_NAME (t2) == NULL_TREE))
if (AGGREGATE_TYPE_P (t1)
&& (TYPE_NAME (t1) == NULL_TREE) != (TYPE_NAME (t2) == NULL_TREE))
return false;
type_pair pair={t1,t2};
@ -2029,10 +2030,14 @@ register_odr_type (tree type)
if (in_lto_p)
odr_vtable_hash = new odr_vtable_hash_type (23);
}
/* Arrange things to be nicer and insert main variants first. */
if (odr_type_p (TYPE_MAIN_VARIANT (type)))
/* Arrange things to be nicer and insert main variants first.
??? fundamental prerecorded types do not have mangled names; this
makes it possible that non-ODR type is main_odr_variant of ODR type.
Things may get smoother if LTO FE set mangled name of those types same
way as C++ FE does. */
if (odr_type_p (main_odr_variant (TYPE_MAIN_VARIANT (type))))
get_odr_type (TYPE_MAIN_VARIANT (type), true);
if (TYPE_MAIN_VARIANT (type) != type)
if (TYPE_MAIN_VARIANT (type) != type && odr_type_p (main_odr_variant (type)))
get_odr_type (type, true);
}

12
gcc/tree.c
View File

@ -5145,7 +5145,17 @@ need_assembler_name_p (tree decl)
&& DECL_NAME (decl)
&& decl == TYPE_NAME (TREE_TYPE (decl))
&& !is_lang_specific (TREE_TYPE (decl))
&& AGGREGATE_TYPE_P (TREE_TYPE (decl))
/* Save some work. Names of builtin types are always derived from
properties of its main variant. A special case are integer types
where mangling do make differences between char/signed char/unsigned
char etc. Storing name for these makes e.g.
-fno-signed-char/-fsigned-char mismatches to be handled well.
See cp/mangle.c:write_builtin_type for details. */
&& (TREE_CODE (TREE_TYPE (decl)) != VOID_TYPE
&& TREE_CODE (TREE_TYPE (decl)) != BOOLEAN_TYPE
&& TREE_CODE (TREE_TYPE (decl)) != REAL_TYPE
&& TREE_CODE (TREE_TYPE (decl)) != FIXED_POINT_TYPE)
&& !TYPE_ARTIFICIAL (TREE_TYPE (decl))
&& !variably_modified_type_p (TREE_TYPE (decl), NULL_TREE)
&& !type_in_anonymous_namespace_p (TREE_TYPE (decl)))