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

re PR lto/88585 (ICE in fld_incomplete_type_of, at tree.c:5295)

Browse Source 
PR lto/88585
	* tree.c (find_atomic_core_type): Move ahead in file.
	(check_base_type): Correctly compare alignments of atomic types.

From-SVN: r269282
This commit is contained in:
Jan Hubicka 2019-02-28 17:45:44 +01:00 committed by Jan Hubicka
parent 0c0c7049a0
commit 6b7e4afbdc
2 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2019-02-28 Jan Hubicka <hubicka@ucw.cz>
PR lto/88585
* tree.c (find_atomic_core_type): Move ahead in file.
(check_base_type): Correctly compare alignments of atomic types.
2019-02-28 H.J. Lu <hongjiu.lu@intel.com>
PR target/89455

94
gcc/tree.c
View File

@ -6329,51 +6329,11 @@ check_lang_type (const_tree cand, const_tree base)
return lang_hooks.types.type_hash_eq (cand, base);
}
/* Returns true iff unqualified CAND and BASE are equivalent. */
bool
check_base_type (const_tree cand, const_tree base)
{
return (TYPE_NAME (cand) == TYPE_NAME (base)
/* Apparently this is needed for Objective-C. */
&& TYPE_CONTEXT (cand) == TYPE_CONTEXT (base)
/* Check alignment. */
&& TYPE_ALIGN (cand) == TYPE_ALIGN (base)
&& attribute_list_equal (TYPE_ATTRIBUTES (cand),
TYPE_ATTRIBUTES (base)));
}
/* Returns true iff CAND is equivalent to BASE with TYPE_QUALS. */
bool
check_qualified_type (const_tree cand, const_tree base, int type_quals)
{
return (TYPE_QUALS (cand) == type_quals
&& check_base_type (cand, base)
&& check_lang_type (cand, base));
}
/* Returns true iff CAND is equivalent to BASE with ALIGN. */
static bool
check_aligned_type (const_tree cand, const_tree base, unsigned int align)
{
return (TYPE_QUALS (cand) == TYPE_QUALS (base)
&& TYPE_NAME (cand) == TYPE_NAME (base)
/* Apparently this is needed for Objective-C. */
&& TYPE_CONTEXT (cand) == TYPE_CONTEXT (base)
/* Check alignment. */
&& TYPE_ALIGN (cand) == align
&& attribute_list_equal (TYPE_ATTRIBUTES (cand),
TYPE_ATTRIBUTES (base))
&& check_lang_type (cand, base));
}
/* This function checks to see if TYPE matches the size one of the built-in
atomic types, and returns that core atomic type. */
static tree
find_atomic_core_type (tree type)
find_atomic_core_type (const_tree type)
{
tree base_atomic_type;
@ -6410,6 +6370,58 @@ find_atomic_core_type (tree type)
return base_atomic_type;
}
/* Returns true iff unqualified CAND and BASE are equivalent. */
bool
check_base_type (const_tree cand, const_tree base)
{
if (TYPE_NAME (cand) != TYPE_NAME (base)
/* Apparently this is needed for Objective-C. */
|| TYPE_CONTEXT (cand) != TYPE_CONTEXT (base)
|| !attribute_list_equal (TYPE_ATTRIBUTES (cand),
TYPE_ATTRIBUTES (base)))
return false;
/* Check alignment. */
if (TYPE_ALIGN (cand) == TYPE_ALIGN (base))
return true;
/* Atomic types increase minimal alignment. We must to do so as well
or we get duplicated canonical types. See PR88686. */
if ((TYPE_QUALS (cand) & TYPE_QUAL_ATOMIC))
{
/* See if this object can map to a basic atomic type. */
tree atomic_type = find_atomic_core_type (cand);
if (atomic_type && TYPE_ALIGN (atomic_type) == TYPE_ALIGN (cand))
return true;
}
return false;
}
/* Returns true iff CAND is equivalent to BASE with TYPE_QUALS. */
bool
check_qualified_type (const_tree cand, const_tree base, int type_quals)
{
return (TYPE_QUALS (cand) == type_quals
&& check_base_type (cand, base)
&& check_lang_type (cand, base));
}
/* Returns true iff CAND is equivalent to BASE with ALIGN. */
static bool
check_aligned_type (const_tree cand, const_tree base, unsigned int align)
{
return (TYPE_QUALS (cand) == TYPE_QUALS (base)
&& TYPE_NAME (cand) == TYPE_NAME (base)
/* Apparently this is needed for Objective-C. */
&& TYPE_CONTEXT (cand) == TYPE_CONTEXT (base)
/* Check alignment. */
&& TYPE_ALIGN (cand) == align
&& attribute_list_equal (TYPE_ATTRIBUTES (cand),
TYPE_ATTRIBUTES (base))
&& check_lang_type (cand, base));
}
/* Return a version of the TYPE, qualified as indicated by the
TYPE_QUALS, if one exists. If no qualified version exists yet,
return NULL_TREE. */