diff options
| author | Jason Merrill <jason@redhat.com> | 2012-07-17 17:34:06 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-07-17 17:34:06 -0400 |
| commit | 697c474c8fadce131f79b662a79a454959d02c39 (patch) | |
| tree | 54c48a3bdc7020c28e9b84caca3583760736ed5b | |
| parent | 7fe3aa081150a5d140a8a6276b659aa906ad0cd5 (diff) | |
| download | gcc-697c474c8fadce131f79b662a79a454959d02c39.zip gcc-697c474c8fadce131f79b662a79a454959d02c39.tar.gz gcc-697c474c8fadce131f79b662a79a454959d02c39.tar.bz2 | |
re PR c++/53989 (Internal compiler error in strip_typedefs, at cp/tree.c:1187)
PR c++/53989
* tree.c (build_cplus_array_type): Also add TYPE_CANONICAL
to the list of variants.
From-SVN: r189587
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/array23.C | 12 |
4 files changed, 32 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3325f1a..c1465cc 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2012-07-17 Jason Merrill <jason@redhat.com> + PR c++/53989 + * tree.c (build_cplus_array_type): Also add TYPE_CANONICAL + to the list of variants. + * decl.c (xref_basetypes): Complain about incomplete template base. * class.c (finish_struct): Adjust variants in templates, too. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 01bc483..3c7bbb132 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -803,12 +803,23 @@ 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) { TYPE_MAIN_VARIANT (t) = m; 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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 70efda9..5784918 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-07-17 Jason Merrill <jason@redhat.com> + + PR c++/53989 + * g++.dg/template/array23.C: New. + 2012-07-17 Tobias Burnus <burnus@net-b.de> PR fortran/53985 diff --git a/gcc/testsuite/g++.dg/template/array23.C b/gcc/testsuite/g++.dg/template/array23.C new file mode 100644 index 0000000..6ede8b0 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/array23.C @@ -0,0 +1,12 @@ +// PR c++/53989 + +struct Foo { + int value; + typedef Foo Foo2; + static Foo2 const foos[2]; +}; + +template <class T> void g (T); +void bar() { + g(&Foo::foos); +} |