Re: [C++ PATCH] Fix ICE in build_value_init (PR c++/51369)

2011-12-07 Thread Jason Merrill
On 12/07/2011 10:18 AM, Jakub Jelinek wrote: On Wed, Dec 07, 2011 at 10:10:08AM -0500, Jason Merrill wrote: On 12/06/2011 02:48 PM, Jakub Jelinek wrote: - gcc_assert (!processing_template_decl || SCALAR_TYPE_P (type)); + gcc_assert (!processing_template_decl + || (SCALAR_TYPE_P (t

Re: [C++ PATCH] Fix ICE in build_value_init (PR c++/51369)

2011-12-07 Thread Jakub Jelinek
On Wed, Dec 07, 2011 at 10:10:08AM -0500, Jason Merrill wrote: > On 12/06/2011 02:48 PM, Jakub Jelinek wrote: > >- gcc_assert (!processing_template_decl || SCALAR_TYPE_P (type)); > >+ gcc_assert (!processing_template_decl > >+ || (SCALAR_TYPE_P (type) || TREE_CODE (type) == ARRAY_TYPE));

Re: [C++ PATCH] Fix ICE in build_value_init (PR c++/51369)

2011-12-07 Thread Jason Merrill
On 12/06/2011 02:48 PM, Jakub Jelinek wrote: - gcc_assert (!processing_template_decl || SCALAR_TYPE_P (type)); + gcc_assert (!processing_template_decl + || (SCALAR_TYPE_P (type) || TREE_CODE (type) == ARRAY_TYPE)); How about SCALAR_TYPE_P (strip_array_types (type))? OK with that