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

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

From-SVN: r155410

gcc/cp/ChangeLog

+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...

gcc/cp/typeck.c

@@ -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",

gcc/testsuite/ChangeLog

+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

gcc/testsuite/g++.dg/cpp0x/initlist29.C

+// 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);