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

re PR c++/57325 (ICE in strip_typedefs, at cp/tree.c:1306) 

PR c++/57325
	* tree.c (build_cplus_array_type): Copy layout info if element
	type is complete.

From-SVN: r199112
This commit is contained in:
Jason Merrill 2013-05-20 13:01:01 -04:00 committed by Jason Merrill
parent 83c56d3ef8
commit c6dc04853f
3 changed files with 50 additions and 2 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 @@
2013-05-20 Jason Merrill <jason@redhat.com>
PR c++/57325
* tree.c (build_cplus_array_type): Copy layout info if element
type is complete.
2013-05-09 Jason Merrill <jason@redhat.com>
PR c++/57047

6
gcc/cp/tree.c
View File

@ -816,10 +816,12 @@ build_cplus_array_type (tree elt_type, tree index_type)
if (TYPE_MAIN_VARIANT (t) != m)
{
if (COMPLETE_TYPE_P (t) && !COMPLETE_TYPE_P (m))
if (COMPLETE_TYPE_P (TREE_TYPE (t)) && !COMPLETE_TYPE_P (m))
{
/* m was built before the element type was complete, so we
also need to copy the layout info from t. */
also need to copy the layout info from t. We might
end up doing this multiple times if t is an array of
unknown bound. */
tree size = TYPE_SIZE (t);
tree size_unit = TYPE_SIZE_UNIT (t);
unsigned int align = TYPE_ALIGN (t);

40
gcc/testsuite/g++.dg/template/array26.C Normal file
View File

@ -0,0 +1,40 @@
// PR c++/57325
class valarray { int _M_data; };
template < typename > struct SimpleJet { valarray partials; };
template < class C > struct scoped_ptr_impl
{
scoped_ptr_impl (C *):data_ () { }
struct Data
{
C ptr;
};
Data data_;
};
template < class, class = int >struct scoped_ptr;
template < class C, class D > struct scoped_ptr <C[], D >
{
scoped_ptr ():impl_ (0) { }
scoped_ptr_impl < C > impl_;
};
template < typename JetsT > void
TestJets (JetsT *)
{
typedef typename JetsT::JetType JetT;
scoped_ptr < JetT[] > a;
}
template < typename T > struct SimpleJets
{
typedef SimpleJet < T > JetType;
scoped_ptr < SimpleJet < T >[] > vars_;
};
void fn ()
{
SimpleJets < double >b;
TestJets (&b);
}