MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(output_init_element): Call default_conversion here.

Browse Source 
Set constructor_erroneous, etc., here.
(process_init_element): Not here.

From-SVN: r5086
This commit is contained in:
Richard Stallman 1993-08-06 07:08:12 +00:00
parent fda59a9a3f
commit d3ab975391
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gcc/c-typeck.c
View File

@ -5734,6 +5734,18 @@ output_init_element (value, type, field, pending)
{
int duplicate = 0;
if (TREE_CODE (TREE_TYPE (value)) == FUNCTION_TYPE
|| (TREE_CODE (TREE_TYPE (value)) == ARRAY_TYPE
&& comptypes (TREE_TYPE (value), type)))
value = default_conversion (value);
if (value == error_mark_node)
constructor_erroneous = 1;
else if (!TREE_CONSTANT (value))
constructor_constant = 0;
else if (initializer_constant_valid_p (value, TREE_TYPE (value)) == 0)
constructor_simple = 0;
if (require_constant_value && ! TREE_CONSTANT (value))
{
error_init ("initializer element%s is not constant",
@ -6026,18 +6038,6 @@ process_init_element (value)
return;
}
if (value != 0)
value = default_conversion (value);
if (value == 0)
;
else if (value == error_mark_node)
constructor_erroneous = 1;
else if (!TREE_CONSTANT (value))
constructor_constant = 0;
else if (initializer_constant_valid_p (value, TREE_TYPE (value)) == 0)
constructor_simple = 0;
if (constructor_stack->replacement_value != 0)
{
error_init ("excess elements in struct initializer%s",