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

re PR c++/42331 (ICE with invalid array initializer) 

PR c++/42331
	* typeck.c (cp_build_modify_expr): Fix thinko.

From-SVN: r155410
This commit is contained in:
Jason Merrill 2009-12-22 18:16:38 -05:00 committed by Jason Merrill
parent e19977d379
commit 5666bb32d1
4 changed files with 28 additions and 4 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 @@
2009-12-22 Jason Merrill <jason@redhat.com>
PR c++/42331
* typeck.c (cp_build_modify_expr): Fix thinko.
2009-12-21 Jason Merrill <jason@redhat.com>
* mangle.c (write_member_name): Move abi-version=1 code back to...

8
gcc/cp/typeck.c
View File

@ -6455,15 +6455,15 @@ cp_build_modify_expr (tree lhs, enum tree_code modifycode, tree rhs,
{
int from_array;
if (BRACE_ENCLOSED_INITIALIZER_P (rhs))
if (BRACE_ENCLOSED_INITIALIZER_P (newrhs))
{
if (check_array_initializer (lhs, lhstype, rhs))
if (check_array_initializer (lhs, lhstype, newrhs))
return error_mark_node;
rhs = digest_init (lhstype, rhs);
newrhs = digest_init (lhstype, newrhs);
}
else if (!same_or_base_type_p (TYPE_MAIN_VARIANT (lhstype),
TYPE_MAIN_VARIANT (TREE_TYPE (rhs))))
TYPE_MAIN_VARIANT (TREE_TYPE (newrhs))))
{
if (complain & tf_error)
error ("incompatible types in assignment of %qT to %qT",

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2009-12-22 Jason Merrill <jason@redhat.com>
PR c++/42331
* g++.dg/cpp0x/initlist29.C: New.
2009-12-22 Iain Sandoe <iain.sandoe@sandoe-acoustics.co.uk>
PR target/41605

14
gcc/testsuite/g++.dg/cpp0x/initlist29.C Normal file
View File

@ -0,0 +1,14 @@
// PR c++/42331
// { dg-options "-std=c++0x" }
class Mesh
{
public:
Mesh(const char*)
{ typele={0}; } // { dg-error "" }
private:
int typele[7][2];
};
Mesh m(0);