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

re PR c++/18793 (ICE in cp_expr_size) 

PR c++/18793
	* cp-objcp-common.c (cp_expr_size): Loosen assertion.

	PR c++/18793
	* g++.dg/init/aggr3.C: New test.

From-SVN: r92156
This commit is contained in:
Mark Mitchell 2004-12-14 19:38:25 +00:00 committed by Mark Mitchell
parent f90ac3f0e4
commit acb3f79a4a
4 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-14 Mark Mitchell <mark@codesourcery.com>
PR c++/18793
* cp-objcp-common.c (cp_expr_size): Loosen assertion.
2004-12-14 Nathan Sidwell <nathan@codesourcery.com>
PR c++/18949

27
gcc/cp/cp-objcp-common.c
View File

@ -75,21 +75,36 @@ cxx_warn_unused_global_decl (tree decl)
tree
cp_expr_size (tree exp)
{
if (CLASS_TYPE_P (TREE_TYPE (exp)))
tree type = TREE_TYPE (exp);
if (CLASS_TYPE_P (type))
{
/* The backend should not be interested in the size of an expression
of a type with both of these set; all copies of such types must go
through a constructor or assignment op. */
gcc_assert (!TYPE_HAS_COMPLEX_INIT_REF (TREE_TYPE (exp))
|| !TYPE_HAS_COMPLEX_ASSIGN_REF (TREE_TYPE (exp))
gcc_assert (!TYPE_HAS_COMPLEX_INIT_REF (type)
|| !TYPE_HAS_COMPLEX_ASSIGN_REF (type)
/* But storing a CONSTRUCTOR isn't a copy. */
|| TREE_CODE (exp) == CONSTRUCTOR);
|| TREE_CODE (exp) == CONSTRUCTOR
/* And, the gimplifier will sometimes make a copy of
an aggregate. In particular, for a case like:
struct S { S(); };
struct X { int a; S s; };
X x = { 0 };
the gimplifier will create a temporary with
static storage duration, perform static
initialization of the temporary, and then copy
the result. Since the "s" subobject is never
constructed, this is a valid transformation. */
|| CP_AGGREGATE_TYPE_P (type));
/* This would be wrong for a type with virtual bases, but they are
caught by the assert above. */
return (is_empty_class (TREE_TYPE (exp))
return (is_empty_class (type)
? size_zero_node
: CLASSTYPE_SIZE_UNIT (TREE_TYPE (exp)));
: CLASSTYPE_SIZE_UNIT (type));
}
else
/* Use the default code. */

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-14 Mark Mitchell <mark@codesourcery.com>
PR c++/18793
* g++.dg/init/aggr3.C: New test.
2004-12-14 Janis Johnson <janis187@us.ibm.com
* gcc.dg/altivec-types-1.c: New test.

16
gcc/testsuite/g++.dg/init/aggr3.C Normal file
View File

@ -0,0 +1,16 @@
// PR c++/18793
struct S {
S();
S(const S&);
void operator=(const S&);
};
struct X {
int a, b, c, d, e;
S s;
};
void foobar () {
X x = {0};
}