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

re PR c++/54038 (finalize_type_size enters infinite loop becasue TYPE_NEXT_VARIANT (variant) == variant) 

PR c++/54038
	* tree.c (build_cplus_array_type): Use build_cplus_array_type to build
	canonical array type rather than mess with its TYPE_*_VARIANT.

From-SVN: r189720
This commit is contained in:
Jason Merrill 2012-07-20 12:11:58 -04:00 committed by Jason Merrill
parent acea806bc8
commit 3a9a9cf92a
4 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2012-07-20 Jason Merrill <jason@redhat.com>
PR c++/54038
* tree.c (build_cplus_array_type): Use build_cplus_array_type to build
canonical array type rather than mess with its TYPE_*_VARIANT.
2012-07-19 Jason Merrill <jason@redhat.com>
PR c++/54026

23
gcc/cp/tree.c
View File

@ -786,7 +786,18 @@ build_cplus_array_type (tree elt_type, tree index_type)
}
}
else
t = build_array_type (elt_type, index_type);
{
if (!TYPE_STRUCTURAL_EQUALITY_P (elt_type)
&& !(index_type && TYPE_STRUCTURAL_EQUALITY_P (index_type))
&& (TYPE_CANONICAL (elt_type) != elt_type
|| (index_type && TYPE_CANONICAL (index_type) != index_type)))
/* Make sure that the canonical type is on the appropriate
variants list. */
build_cplus_array_type
(TYPE_CANONICAL (elt_type),
index_type ? TYPE_CANONICAL (index_type) : index_type);
t = build_array_type (elt_type, index_type);
}
/* We want TYPE_MAIN_VARIANT of an array to strip cv-quals from the
element type as well, so fix it up if needed. */
@ -794,7 +805,6 @@ build_cplus_array_type (tree elt_type, tree index_type)
{
tree m = build_cplus_array_type (TYPE_MAIN_VARIANT (elt_type),
index_type);
tree c = TYPE_CANONICAL (t);
if (TYPE_MAIN_VARIANT (t) != m)
{
@ -802,15 +812,6 @@ build_cplus_array_type (tree elt_type, tree index_type)
TYPE_NEXT_VARIANT (t) = TYPE_NEXT_VARIANT (m);
TYPE_NEXT_VARIANT (m) = t;
}
/* If we built a new array type for TYPE_CANONICAL, add
that to the list of variants as well. */
if (c && c != t && TYPE_MAIN_VARIANT (c) != m)
{
TYPE_MAIN_VARIANT (c) = m;
TYPE_NEXT_VARIANT (c) = t;
TYPE_NEXT_VARIANT (m) = c;
}
}
/* Push these needs up so that initialization takes place

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2012-07-20 Jason Merrill <jason@redhat.com>
PR c++/54038
* g++.dg/other/array7.C: New.
2012-07-19 Jason Merrill <jason@redhat.com>
PR c++/54026

9
gcc/testsuite/g++.dg/other/array7.C Normal file
View File

@ -0,0 +1,9 @@
// PR c++/54038
extern const char *const v[];
typedef char T;
void foo (const T *const[]);
struct A
{
static const char *const a[];
};