git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR c++/41144 (ice for legal code with -O2 in get_alias_set) 

2009-09-06  Richard Guenther  <rguenther@suse.de>

	PR middle-end/41144
	* tree.c (build_array_type): Do not record types marked
	with structural equality in the canonical type hashtable.

	* g++.dg/torture/pr41144.C: New testcase.

From-SVN: r151461
This commit is contained in:
Richard Guenther 2009-09-06 16:49:48 +00:00 committed by Richard Biener
parent 3c45b96b27
commit 3797a0ff2f
4 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2009-09-06 Richard Guenther <rguenther@suse.de>
PR middle-end/41144
* tree.c (build_array_type): Do not record types marked
with structural equality in the canonical type hashtable.
2009-09-06 Richard Guenther <rguenther@suse.de>
PR middle-end/41261

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2009-09-06 Richard Guenther <rguenther@suse.de>
PR middle-end/41144
* g++.dg/torture/pr41144.C: New testcase.
2009-09-06 Richard Guenther <rguenther@suse.de>
PR middle-end/41261

23
gcc/testsuite/g++.dg/torture/pr41144.C Normal file
View File

@ -0,0 +1,23 @@
/* { dg-do compile } */
struct rgba8;
template<class ColorT> class span_gouraud {
public:
struct coord_type { };
coord_type m_coord[3];
};
template<class ColorT> class span_gouraud_rgba : public span_gouraud<ColorT>
{
typedef ColorT color_type;
typedef span_gouraud<color_type> base_type;
typedef typename base_type::coord_type coord_type;
public:
void prepare() {
coord_type coord[3];
}
};
void the_application() {
typedef span_gouraud_rgba<rgba8> gouraud_span_gen_type;
gouraud_span_gen_type span_gouraud;
span_gouraud.prepare();
}

37
gcc/tree.c
View File

@ -6906,44 +6906,29 @@ build_array_type (tree elt_type, tree index_type)
t = make_node (ARRAY_TYPE);
TREE_TYPE (t) = elt_type;
TYPE_DOMAIN (t) = index_type;
if (index_type == 0)
{
tree save = t;
hashcode = iterative_hash_object (TYPE_HASH (elt_type), hashcode);
t = type_hash_canon (hashcode, t);
if (save == t)
layout_type (t);
layout_type (t);
if (TYPE_CANONICAL (t) == t)
{
if (TYPE_STRUCTURAL_EQUALITY_P (elt_type))
SET_TYPE_STRUCTURAL_EQUALITY (t);
else if (TYPE_CANONICAL (elt_type) != elt_type)
TYPE_CANONICAL (t)
= build_array_type (TYPE_CANONICAL (elt_type), index_type);
}
return t;
}
/* If the element type is incomplete at this point we get marked for
structural equality. Do not record these types in the canonical
type hashtable. */
if (TYPE_STRUCTURAL_EQUALITY_P (t))
return t;
hashcode = iterative_hash_object (TYPE_HASH (elt_type), hashcode);
hashcode = iterative_hash_object (TYPE_HASH (index_type), hashcode);
if (index_type)
hashcode = iterative_hash_object (TYPE_HASH (index_type), hashcode);
t = type_hash_canon (hashcode, t);
if (!COMPLETE_TYPE_P (t))
layout_type (t);
if (TYPE_CANONICAL (t) == t)
{
if (TYPE_STRUCTURAL_EQUALITY_P (elt_type)
|| TYPE_STRUCTURAL_EQUALITY_P (index_type))
|| (index_type && TYPE_STRUCTURAL_EQUALITY_P (index_type)))
SET_TYPE_STRUCTURAL_EQUALITY (t);
else if (TYPE_CANONICAL (elt_type) != elt_type
|| TYPE_CANONICAL (index_type) != index_type)
|| (index_type && TYPE_CANONICAL (index_type) != index_type))
TYPE_CANONICAL (t)
= build_array_type (TYPE_CANONICAL (elt_type),
TYPE_CANONICAL (index_type));
index_type ? TYPE_CANONICAL (index_type) : NULL);
}
return t;