Skip to content

R
riscv-gcc-1
Commit a1e3b3d9 by Laurynas Biveinis Committed by Laurynas Biveinis
Options

2010-04-22 Laurynas Biveinis <laurynas.biveinis@gmail.com> 

	* c-tree.h (push_init_level, pop_init_level, set_init_index)
	(process_init_element): New argument of type struct obstack *.

	* c-typeck.c (push_init_level, pop_init_level, set_designator)
	(set_init_index, set_init_label, set_nonincremental_init)
	(set_nonincremental_init_from_string, find_init_member)
	(output_init_element, output_pending_init_elements)
	(process_init_element): New argument braced_init_obstack.  Pass it
	down.
	(push_range_stack, add_pending_init): New argument
	braced_init_obstack.  Use obstack allocation.

	* c-parser.c (c_parser_initelt, c_parser_initval): New argument
	braced_init_obstack.  Pass it down.
	(c_parser_braced_init): New variables ret, braced_init_obstack.
	Initialize obstack, pass it down and finally free it.

From-SVN: r158634
parent 5b58b39b
Showing with 147 additions and 86 deletions
gcc/ChangeLog
2010-04-22 Laurynas Biveinis <laurynas.biveinis@gmail.com>
* c-tree.h (push_init_level, pop_init_level, set_init_index)
(process_init_element): New argument of type struct obstack *.
* c-typeck.c (push_init_level, pop_init_level, set_designator)
(set_init_index, set_init_label, set_nonincremental_init)
(set_nonincremental_init_from_string, find_init_member)
(output_init_element, output_pending_init_elements)
(process_init_element): New argument braced_init_obstack. Pass it
down.
(push_range_stack, add_pending_init): New argument
braced_init_obstack. Use obstack allocation.
* c-parser.c (c_parser_initelt, c_parser_initval): New argument
braced_init_obstack. Pass it down.
(c_parser_braced_init): New variables ret, braced_init_obstack.
Initialize obstack, pass it down and finally free it.
2010-04-22 Bernd Schmidt <bernds@codesourcery.com> 2010-04-22 Bernd Schmidt <bernds@codesourcery.com>
PR middle-end/29274 PR middle-end/29274
......
gcc/c-parser.c
...@@ -906,8 +906,9 @@ static tree c_parser_attributes (c_parser *); ...@@ -906,8 +906,9 @@ static tree c_parser_attributes (c_parser *);
static struct c_type_name *c_parser_type_name (c_parser *); static struct c_type_name *c_parser_type_name (c_parser *);
static struct c_expr c_parser_initializer (c_parser *); static struct c_expr c_parser_initializer (c_parser *);
static struct c_expr c_parser_braced_init (c_parser *, tree, bool); static struct c_expr c_parser_braced_init (c_parser *, tree, bool);
static void c_parser_initelt (c_parser *); static void c_parser_initelt (c_parser *, struct obstack *);
static void c_parser_initval (c_parser *, struct c_expr *); static void c_parser_initval (c_parser *, struct c_expr *,
struct obstack *);
static tree c_parser_compound_statement (c_parser *); static tree c_parser_compound_statement (c_parser *);
static void c_parser_compound_statement_nostart (c_parser *); static void c_parser_compound_statement_nostart (c_parser *);
static void c_parser_label (c_parser *); static void c_parser_label (c_parser *);
...@@ -3088,11 +3089,14 @@ c_parser_initializer (c_parser *parser) ...@@ -3088,11 +3089,14 @@ c_parser_initializer (c_parser *parser)
static struct c_expr static struct c_expr
c_parser_braced_init (c_parser *parser, tree type, bool nested_p) c_parser_braced_init (c_parser *parser, tree type, bool nested_p)
{ {
struct c_expr ret;
struct obstack braced_init_obstack;
location_t brace_loc = c_parser_peek_token (parser)->location; location_t brace_loc = c_parser_peek_token (parser)->location;
gcc_obstack_init (&braced_init_obstack);
gcc_assert (c_parser_next_token_is (parser, CPP_OPEN_BRACE)); gcc_assert (c_parser_next_token_is (parser, CPP_OPEN_BRACE));
c_parser_consume_token (parser); c_parser_consume_token (parser);
if (nested_p) if (nested_p)
push_init_level (0); push_init_level (0, &braced_init_obstack);
else else
really_start_incremental_init (type); really_start_incremental_init (type);
if (c_parser_next_token_is (parser, CPP_CLOSE_BRACE)) if (c_parser_next_token_is (parser, CPP_CLOSE_BRACE))
...@@ -3105,7 +3109,7 @@ c_parser_braced_init (c_parser *parser, tree type, bool nested_p) ...@@ -3105,7 +3109,7 @@ c_parser_braced_init (c_parser *parser, tree type, bool nested_p)
comma. */ comma. */
while (true) while (true)
{ {
c_parser_initelt (parser); c_parser_initelt (parser, &braced_init_obstack);
if (parser->error) if (parser->error)
break; break;
if (c_parser_next_token_is (parser, CPP_COMMA)) if (c_parser_next_token_is (parser, CPP_COMMA))
...@@ -3118,22 +3122,24 @@ c_parser_braced_init (c_parser *parser, tree type, bool nested_p) ...@@ -3118,22 +3122,24 @@ c_parser_braced_init (c_parser *parser, tree type, bool nested_p)
} }
if (c_parser_next_token_is_not (parser, CPP_CLOSE_BRACE)) if (c_parser_next_token_is_not (parser, CPP_CLOSE_BRACE))
{ {
struct c_expr ret;
ret.value = error_mark_node; ret.value = error_mark_node;
ret.original_code = ERROR_MARK; ret.original_code = ERROR_MARK;
ret.original_type = NULL; ret.original_type = NULL;
c_parser_skip_until_found (parser, CPP_CLOSE_BRACE, "expected %<}%>"); c_parser_skip_until_found (parser, CPP_CLOSE_BRACE, "expected %<}%>");
pop_init_level (0); pop_init_level (0, &braced_init_obstack);
obstack_free (&braced_init_obstack, NULL);
return ret; return ret;
} }
c_parser_consume_token (parser); c_parser_consume_token (parser);
return pop_init_level (0); ret = pop_init_level (0, &braced_init_obstack);
obstack_free (&braced_init_obstack, NULL);
return ret;
} }
/* Parse a nested initializer, including designators. */ /* Parse a nested initializer, including designators. */
static void static void
c_parser_initelt (c_parser *parser) c_parser_initelt (c_parser *parser, struct obstack * braced_init_obstack)
{ {
/* Parse any designator or designator list. A single array /* Parse any designator or designator list. A single array
designator may have the subsequent "=" omitted in GNU C, but a designator may have the subsequent "=" omitted in GNU C, but a
...@@ -3142,7 +3148,8 @@ c_parser_initelt (c_parser *parser) ...@@ -3142,7 +3148,8 @@ c_parser_initelt (c_parser *parser)
&& c_parser_peek_2nd_token (parser)->type == CPP_COLON) && c_parser_peek_2nd_token (parser)->type == CPP_COLON)
{ {
/* Old-style structure member designator. */ /* Old-style structure member designator. */
set_init_label (c_parser_peek_token (parser)->value); set_init_label (c_parser_peek_token (parser)->value,
braced_init_obstack);
/* Use the colon as the error location. */ /* Use the colon as the error location. */
pedwarn (c_parser_peek_2nd_token (parser)->location, OPT_pedantic, pedwarn (c_parser_peek_2nd_token (parser)->location, OPT_pedantic,
"obsolete use of designated initializer with %<:%>"); "obsolete use of designated initializer with %<:%>");
...@@ -3170,7 +3177,8 @@ c_parser_initelt (c_parser *parser) ...@@ -3170,7 +3177,8 @@ c_parser_initelt (c_parser *parser)
c_parser_consume_token (parser); c_parser_consume_token (parser);
if (c_parser_next_token_is (parser, CPP_NAME)) if (c_parser_next_token_is (parser, CPP_NAME))
{ {
set_init_label (c_parser_peek_token (parser)->value); set_init_label (c_parser_peek_token (parser)->value,
braced_init_obstack);
c_parser_consume_token (parser); c_parser_consume_token (parser);
} }
else else
...@@ -3181,7 +3189,7 @@ c_parser_initelt (c_parser *parser) ...@@ -3181,7 +3189,7 @@ c_parser_initelt (c_parser *parser)
init.original_type = NULL; init.original_type = NULL;
c_parser_error (parser, "expected identifier"); c_parser_error (parser, "expected identifier");
c_parser_skip_until_found (parser, CPP_COMMA, NULL); c_parser_skip_until_found (parser, CPP_COMMA, NULL);
process_init_element (init, false); process_init_element (init, false, braced_init_obstack);
return; return;
} }
} }
...@@ -3262,7 +3270,7 @@ c_parser_initelt (c_parser *parser) ...@@ -3262,7 +3270,7 @@ c_parser_initelt (c_parser *parser)
/* Now parse and process the remainder of the /* Now parse and process the remainder of the
initializer, starting with this message initializer, starting with this message
expression as a primary-expression. */ expression as a primary-expression. */
c_parser_initval (parser, &mexpr); c_parser_initval (parser, &mexpr, braced_init_obstack);
return; return;
} }
c_parser_consume_token (parser); c_parser_consume_token (parser);
...@@ -3281,7 +3289,7 @@ c_parser_initelt (c_parser *parser) ...@@ -3281,7 +3289,7 @@ c_parser_initelt (c_parser *parser)
if (c_parser_next_token_is (parser, CPP_CLOSE_SQUARE)) if (c_parser_next_token_is (parser, CPP_CLOSE_SQUARE))
{ {
c_parser_consume_token (parser); c_parser_consume_token (parser);
set_init_index (first, second); set_init_index (first, second, braced_init_obstack);
if (second) if (second)
pedwarn (ellipsis_loc, OPT_pedantic, pedwarn (ellipsis_loc, OPT_pedantic,
"ISO C forbids specifying range of elements to initialize"); "ISO C forbids specifying range of elements to initialize");
...@@ -3313,13 +3321,13 @@ c_parser_initelt (c_parser *parser) ...@@ -3313,13 +3321,13 @@ c_parser_initelt (c_parser *parser)
init.original_type = NULL; init.original_type = NULL;
c_parser_error (parser, "expected %<=%>"); c_parser_error (parser, "expected %<=%>");
c_parser_skip_until_found (parser, CPP_COMMA, NULL); c_parser_skip_until_found (parser, CPP_COMMA, NULL);
process_init_element (init, false); process_init_element (init, false, braced_init_obstack);
return; return;
} }
} }
} }
} }
c_parser_initval (parser, NULL); c_parser_initval (parser, NULL, braced_init_obstack);
} }
/* Parse a nested initializer; as c_parser_initializer but parses /* Parse a nested initializer; as c_parser_initializer but parses
...@@ -3329,7 +3337,8 @@ c_parser_initelt (c_parser *parser) ...@@ -3329,7 +3337,8 @@ c_parser_initelt (c_parser *parser)
initializer. */ initializer. */
static void static void
c_parser_initval (c_parser *parser, struct c_expr *after) c_parser_initval (c_parser *parser, struct c_expr *after,
struct obstack * braced_init_obstack)
{ {
struct c_expr init; struct c_expr init;
gcc_assert (!after || c_dialect_objc ()); gcc_assert (!after || c_dialect_objc ());
...@@ -3344,7 +3353,7 @@ c_parser_initval (c_parser *parser, struct c_expr *after) ...@@ -3344,7 +3353,7 @@ c_parser_initval (c_parser *parser, struct c_expr *after)
&& TREE_CODE (init.value) != COMPOUND_LITERAL_EXPR) && TREE_CODE (init.value) != COMPOUND_LITERAL_EXPR)
init = default_function_array_read_conversion (loc, init); init = default_function_array_read_conversion (loc, init);
} }
process_init_element (init, false); process_init_element (init, false, braced_init_obstack);
} }
/* Parse a compound statement (possibly a function body) (C90 6.6.2, /* Parse a compound statement (possibly a function body) (C90 6.6.2,
......
gcc/c-tree.h
...@@ -539,11 +539,11 @@ extern void maybe_warn_string_init (tree, struct c_expr); ...@@ -539,11 +539,11 @@ extern void maybe_warn_string_init (tree, struct c_expr);
extern void start_init (tree, tree, int); extern void start_init (tree, tree, int);
extern void finish_init (void); extern void finish_init (void);
extern void really_start_incremental_init (tree); extern void really_start_incremental_init (tree);
extern void push_init_level (int); extern void push_init_level (int, struct obstack *);
extern struct c_expr pop_init_level (int); extern struct c_expr pop_init_level (int, struct obstack *);
extern void set_init_index (tree, tree); extern void set_init_index (tree, tree, struct obstack *);
extern void set_init_label (tree); extern void set_init_label (tree, struct obstack *);
extern void process_init_element (struct c_expr, bool); extern void process_init_element (struct c_expr, bool, struct obstack *);
extern tree build_compound_literal (location_t, tree, tree, bool); extern tree build_compound_literal (location_t, tree, tree, bool);
extern void check_compound_literal_type (location_t, struct c_type_name *); extern void check_compound_literal_type (location_t, struct c_type_name *);
extern tree c_start_case (location_t, location_t, tree); extern tree c_start_case (location_t, location_t, tree);
......
gcc/c-typeck.c
...@@ -97,14 +97,15 @@ static int spelling_length (void); ...@@ -97,14 +97,15 @@ static int spelling_length (void);
static char *print_spelling (char *); static char *print_spelling (char *);
static void warning_init (int, const char *); static void warning_init (int, const char *);
static tree digest_init (location_t, tree, tree, tree, bool, bool, int); static tree digest_init (location_t, tree, tree, tree, bool, bool, int);
static void output_init_element (tree, tree, bool, tree, tree, int, bool); static void output_init_element (tree, tree, bool, tree, tree, int, bool,
static void output_pending_init_elements (int); struct obstack *);
static int set_designator (int); static void output_pending_init_elements (int, struct obstack *);
static void push_range_stack (tree); static int set_designator (int, struct obstack *);
static void add_pending_init (tree, tree, tree, bool); static void push_range_stack (tree, struct obstack *);
static void set_nonincremental_init (void); static void add_pending_init (tree, tree, tree, bool, struct obstack *);
static void set_nonincremental_init_from_string (tree); static void set_nonincremental_init (struct obstack *);
static tree find_init_member (tree); static void set_nonincremental_init_from_string (tree, struct obstack *);
static tree find_init_member (tree, struct obstack *);
static void readonly_error (tree, enum lvalue_use); static void readonly_error (tree, enum lvalue_use);
static void readonly_warning (tree, enum lvalue_use); static void readonly_warning (tree, enum lvalue_use);
static int lvalue_or_else (const_tree, enum lvalue_use); static int lvalue_or_else (const_tree, enum lvalue_use);
...@@ -6433,7 +6434,7 @@ really_start_incremental_init (tree type) ...@@ -6433,7 +6434,7 @@ really_start_incremental_init (tree type)
IMPLICIT is 1 (or 2 if the push is because of designator list). */ IMPLICIT is 1 (or 2 if the push is because of designator list). */
void void
push_init_level (int implicit) push_init_level (int implicit, struct obstack * braced_init_obstack)
{ {
struct constructor_stack *p; struct constructor_stack *p;
tree value = NULL_TREE; tree value = NULL_TREE;
...@@ -6451,12 +6452,14 @@ push_init_level (int implicit) ...@@ -6451,12 +6452,14 @@ push_init_level (int implicit)
if ((TREE_CODE (constructor_type) == RECORD_TYPE if ((TREE_CODE (constructor_type) == RECORD_TYPE
|| TREE_CODE (constructor_type) == UNION_TYPE) || TREE_CODE (constructor_type) == UNION_TYPE)
&& constructor_fields == 0) && constructor_fields == 0)
process_init_element (pop_init_level (1), true); process_init_element (pop_init_level (1, braced_init_obstack),
true, braced_init_obstack);
else if (TREE_CODE (constructor_type) == ARRAY_TYPE else if (TREE_CODE (constructor_type) == ARRAY_TYPE
&& constructor_max_index && constructor_max_index
&& tree_int_cst_lt (constructor_max_index, && tree_int_cst_lt (constructor_max_index,
constructor_index)) constructor_index))
process_init_element (pop_init_level (1), true); process_init_element (pop_init_level (1, braced_init_obstack),
true, braced_init_obstack);
else else
break; break;
} }
...@@ -6469,9 +6472,9 @@ push_init_level (int implicit) ...@@ -6469,9 +6472,9 @@ push_init_level (int implicit)
if ((TREE_CODE (constructor_type) == RECORD_TYPE if ((TREE_CODE (constructor_type) == RECORD_TYPE
|| TREE_CODE (constructor_type) == UNION_TYPE) || TREE_CODE (constructor_type) == UNION_TYPE)
&& constructor_fields) && constructor_fields)
value = find_init_member (constructor_fields); value = find_init_member (constructor_fields, braced_init_obstack);
else if (TREE_CODE (constructor_type) == ARRAY_TYPE) else if (TREE_CODE (constructor_type) == ARRAY_TYPE)
value = find_init_member (constructor_index); value = find_init_member (constructor_index, braced_init_obstack);
} }
p = XNEW (struct constructor_stack); p = XNEW (struct constructor_stack);
...@@ -6557,7 +6560,7 @@ push_init_level (int implicit) ...@@ -6557,7 +6560,7 @@ push_init_level (int implicit)
if (!VEC_empty (constructor_elt, constructor_elements) if (!VEC_empty (constructor_elt, constructor_elements)
&& (TREE_CODE (constructor_type) == RECORD_TYPE && (TREE_CODE (constructor_type) == RECORD_TYPE
|| TREE_CODE (constructor_type) == ARRAY_TYPE)) || TREE_CODE (constructor_type) == ARRAY_TYPE))
set_nonincremental_init (); set_nonincremental_init (braced_init_obstack);
} }
if (implicit == 1 && warn_missing_braces && !missing_braces_mentioned) if (implicit == 1 && warn_missing_braces && !missing_braces_mentioned)
...@@ -6618,7 +6621,7 @@ push_init_level (int implicit) ...@@ -6618,7 +6621,7 @@ push_init_level (int implicit)
/* We need to split the char/wchar array into individual /* We need to split the char/wchar array into individual
characters, so that we don't have to special case it characters, so that we don't have to special case it
everywhere. */ everywhere. */
set_nonincremental_init_from_string (value); set_nonincremental_init_from_string (value, braced_init_obstack);
} }
} }
else else
...@@ -6642,7 +6645,7 @@ push_init_level (int implicit) ...@@ -6642,7 +6645,7 @@ push_init_level (int implicit)
Otherwise, return a CONSTRUCTOR expression as the value. */ Otherwise, return a CONSTRUCTOR expression as the value. */
struct c_expr struct c_expr
pop_init_level (int implicit) pop_init_level (int implicit, struct obstack * braced_init_obstack)
{ {
struct constructor_stack *p; struct constructor_stack *p;
struct c_expr ret; struct c_expr ret;
...@@ -6655,14 +6658,16 @@ pop_init_level (int implicit) ...@@ -6655,14 +6658,16 @@ pop_init_level (int implicit)
/* When we come to an explicit close brace, /* When we come to an explicit close brace,
pop any inner levels that didn't have explicit braces. */ pop any inner levels that didn't have explicit braces. */
while (constructor_stack->implicit) while (constructor_stack->implicit)
process_init_element (pop_init_level (1), true); {
process_init_element (pop_init_level (1, braced_init_obstack),
true, braced_init_obstack);
}
gcc_assert (!constructor_range_stack); gcc_assert (!constructor_range_stack);
} }
/* Now output all pending elements. */ /* Now output all pending elements. */
constructor_incremental = 1; constructor_incremental = 1;
output_pending_init_elements (1); output_pending_init_elements (1, braced_init_obstack);
p = constructor_stack; p = constructor_stack;
...@@ -6803,7 +6808,7 @@ pop_init_level (int implicit) ...@@ -6803,7 +6808,7 @@ pop_init_level (int implicit)
ARRAY argument is nonzero for array ranges. Returns zero for success. */ ARRAY argument is nonzero for array ranges. Returns zero for success. */
static int static int
set_designator (int array) set_designator (int array, struct obstack * braced_init_obstack)
{ {
tree subtype; tree subtype;
enum tree_code subcode; enum tree_code subcode;
...@@ -6825,7 +6830,10 @@ set_designator (int array) ...@@ -6825,7 +6830,10 @@ set_designator (int array)
/* Designator list starts at the level of closest explicit /* Designator list starts at the level of closest explicit
braces. */ braces. */
while (constructor_stack->implicit) while (constructor_stack->implicit)
process_init_element (pop_init_level (1), true); {
process_init_element (pop_init_level (1, braced_init_obstack),
true, braced_init_obstack);
}
constructor_designated = 1; constructor_designated = 1;
return 0; return 0;
} }
...@@ -6858,7 +6866,7 @@ set_designator (int array) ...@@ -6858,7 +6866,7 @@ set_designator (int array)
} }
constructor_designated = 1; constructor_designated = 1;
push_init_level (2); push_init_level (2, braced_init_obstack);
return 0; return 0;
} }
...@@ -6867,11 +6875,13 @@ set_designator (int array) ...@@ -6867,11 +6875,13 @@ set_designator (int array)
NULL_TREE if there is no range designator at this level. */ NULL_TREE if there is no range designator at this level. */
static void static void
push_range_stack (tree range_end) push_range_stack (tree range_end, struct obstack * braced_init_obstack)
{ {
struct constructor_range_stack *p; struct constructor_range_stack *p;
p = GGC_NEW (struct constructor_range_stack); p = (struct constructor_range_stack *)
obstack_alloc (braced_init_obstack,
sizeof (struct constructor_range_stack));
p->prev = constructor_range_stack; p->prev = constructor_range_stack;
p->next = 0; p->next = 0;
p->fields = constructor_fields; p->fields = constructor_fields;
...@@ -6889,9 +6899,10 @@ push_range_stack (tree range_end) ...@@ -6889,9 +6899,10 @@ push_range_stack (tree range_end)
of indices, running from FIRST through LAST. */ of indices, running from FIRST through LAST. */
void void
set_init_index (tree first, tree last) set_init_index (tree first, tree last,
struct obstack * braced_init_obstack)
{ {
if (set_designator (1)) if (set_designator (1, braced_init_obstack))
return; return;
designator_erroneous = 1; designator_erroneous = 1;
...@@ -6963,18 +6974,18 @@ set_init_index (tree first, tree last) ...@@ -6963,18 +6974,18 @@ set_init_index (tree first, tree last)
designator_depth++; designator_depth++;
designator_erroneous = 0; designator_erroneous = 0;
if (constructor_range_stack || last) if (constructor_range_stack || last)
push_range_stack (last); push_range_stack (last, braced_init_obstack);
} }
} }
/* Within a struct initializer, specify the next field to be initialized. */ /* Within a struct initializer, specify the next field to be initialized. */
void void
set_init_label (tree fieldname) set_init_label (tree fieldname, struct obstack * braced_init_obstack)
{ {
tree tail; tree tail;
if (set_designator (0)) if (set_designator (0, braced_init_obstack))
return; return;
designator_erroneous = 1; designator_erroneous = 1;
...@@ -7001,7 +7012,7 @@ set_init_label (tree fieldname) ...@@ -7001,7 +7012,7 @@ set_init_label (tree fieldname)
designator_depth++; designator_depth++;
designator_erroneous = 0; designator_erroneous = 0;
if (constructor_range_stack) if (constructor_range_stack)
push_range_stack (NULL_TREE); push_range_stack (NULL_TREE, braced_init_obstack);
} }
} }
...@@ -7016,7 +7027,8 @@ set_init_label (tree fieldname) ...@@ -7016,7 +7027,8 @@ set_init_label (tree fieldname)
existing initializer. */ existing initializer. */
static void static void
add_pending_init (tree purpose, tree value, tree origtype, bool implicit) add_pending_init (tree purpose, tree value, tree origtype, bool implicit,
struct obstack * braced_init_obstack)
{ {
struct init_node *p, **q, *r; struct init_node *p, **q, *r;
...@@ -7075,7 +7087,8 @@ add_pending_init (tree purpose, tree value, tree origtype, bool implicit) ...@@ -7075,7 +7087,8 @@ add_pending_init (tree purpose, tree value, tree origtype, bool implicit)
} }
} }
r = GGC_NEW (struct init_node); r = (struct init_node *) obstack_alloc (braced_init_obstack,
sizeof (struct init_node));
r->purpose = purpose; r->purpose = purpose;
r->value = value; r->value = value;
r->origtype = origtype; r->origtype = origtype;
...@@ -7244,7 +7257,7 @@ add_pending_init (tree purpose, tree value, tree origtype, bool implicit) ...@@ -7244,7 +7257,7 @@ add_pending_init (tree purpose, tree value, tree origtype, bool implicit)
/* Build AVL tree from a sorted chain. */ /* Build AVL tree from a sorted chain. */
static void static void
set_nonincremental_init (void) set_nonincremental_init (struct obstack * braced_init_obstack)
{ {
unsigned HOST_WIDE_INT ix; unsigned HOST_WIDE_INT ix;
tree index, value; tree index, value;
...@@ -7254,7 +7267,10 @@ set_nonincremental_init (void) ...@@ -7254,7 +7267,10 @@ set_nonincremental_init (void)
return; return;
FOR_EACH_CONSTRUCTOR_ELT (constructor_elements, ix, index, value) FOR_EACH_CONSTRUCTOR_ELT (constructor_elements, ix, index, value)
add_pending_init (index, value, NULL_TREE, false); {
add_pending_init (index, value, NULL_TREE, false,
braced_init_obstack);
}
constructor_elements = 0; constructor_elements = 0;
if (TREE_CODE (constructor_type) == RECORD_TYPE) if (TREE_CODE (constructor_type) == RECORD_TYPE)
{ {
...@@ -7281,7 +7297,8 @@ set_nonincremental_init (void) ...@@ -7281,7 +7297,8 @@ set_nonincremental_init (void)
/* Build AVL tree from a string constant. */ /* Build AVL tree from a string constant. */
static void static void
set_nonincremental_init_from_string (tree str) set_nonincremental_init_from_string (tree str,
struct obstack * braced_init_obstack)
{ {
tree value, purpose, type; tree value, purpose, type;
HOST_WIDE_INT val[2]; HOST_WIDE_INT val[2];
...@@ -7344,7 +7361,8 @@ set_nonincremental_init_from_string (tree str) ...@@ -7344,7 +7361,8 @@ set_nonincremental_init_from_string (tree str)
} }
value = build_int_cst_wide (type, val[1], val[0]); value = build_int_cst_wide (type, val[1], val[0]);
add_pending_init (purpose, value, NULL_TREE, false); add_pending_init (purpose, value, NULL_TREE, false,
braced_init_obstack);
} }
constructor_incremental = 0; constructor_incremental = 0;
...@@ -7354,7 +7372,7 @@ set_nonincremental_init_from_string (tree str) ...@@ -7354,7 +7372,7 @@ set_nonincremental_init_from_string (tree str)
not initialized yet. */ not initialized yet. */
static tree static tree
find_init_member (tree field) find_init_member (tree field, struct obstack * braced_init_obstack)
{ {
struct init_node *p; struct init_node *p;
...@@ -7362,7 +7380,7 @@ find_init_member (tree field) ...@@ -7362,7 +7380,7 @@ find_init_member (tree field)
{ {
if (constructor_incremental if (constructor_incremental
&& tree_int_cst_lt (field, constructor_unfilled_index)) && tree_int_cst_lt (field, constructor_unfilled_index))
set_nonincremental_init (); set_nonincremental_init (braced_init_obstack);
p = constructor_pending_elts; p = constructor_pending_elts;
while (p) while (p)
...@@ -7383,7 +7401,7 @@ find_init_member (tree field) ...@@ -7383,7 +7401,7 @@ find_init_member (tree field)
&& (!constructor_unfilled_fields && (!constructor_unfilled_fields
|| tree_int_cst_lt (bitpos, || tree_int_cst_lt (bitpos,
bit_position (constructor_unfilled_fields)))) bit_position (constructor_unfilled_fields))))
set_nonincremental_init (); set_nonincremental_init (braced_init_obstack);
p = constructor_pending_elts; p = constructor_pending_elts;
while (p) while (p)
...@@ -7427,7 +7445,8 @@ find_init_member (tree field) ...@@ -7427,7 +7445,8 @@ find_init_member (tree field)
static void static void
output_init_element (tree value, tree origtype, bool strict_string, tree type, output_init_element (tree value, tree origtype, bool strict_string, tree type,
tree field, int pending, bool implicit) tree field, int pending, bool implicit,
struct obstack * braced_init_obstack)
{ {
tree semantic_type = NULL_TREE; tree semantic_type = NULL_TREE;
constructor_elt *celt; constructor_elt *celt;
...@@ -7544,9 +7563,10 @@ output_init_element (tree value, tree origtype, bool strict_string, tree type, ...@@ -7544,9 +7563,10 @@ output_init_element (tree value, tree origtype, bool strict_string, tree type,
{ {
if (constructor_incremental if (constructor_incremental
&& tree_int_cst_lt (field, constructor_unfilled_index)) && tree_int_cst_lt (field, constructor_unfilled_index))
set_nonincremental_init (); set_nonincremental_init (braced_init_obstack);
add_pending_init (field, value, origtype, implicit); add_pending_init (field, value, origtype, implicit,
braced_init_obstack);
return; return;
} }
else if (TREE_CODE (constructor_type) == RECORD_TYPE else if (TREE_CODE (constructor_type) == RECORD_TYPE
...@@ -7559,7 +7579,7 @@ output_init_element (tree value, tree origtype, bool strict_string, tree type, ...@@ -7559,7 +7579,7 @@ output_init_element (tree value, tree origtype, bool strict_string, tree type,
if (constructor_incremental) if (constructor_incremental)
{ {
if (!constructor_unfilled_fields) if (!constructor_unfilled_fields)
set_nonincremental_init (); set_nonincremental_init (braced_init_obstack);
else else
{ {
tree bitpos, unfillpos; tree bitpos, unfillpos;
...@@ -7568,11 +7588,12 @@ output_init_element (tree value, tree origtype, bool strict_string, tree type, ...@@ -7568,11 +7588,12 @@ output_init_element (tree value, tree origtype, bool strict_string, tree type,
unfillpos = bit_position (constructor_unfilled_fields); unfillpos = bit_position (constructor_unfilled_fields);
if (tree_int_cst_lt (bitpos, unfillpos)) if (tree_int_cst_lt (bitpos, unfillpos))
set_nonincremental_init (); set_nonincremental_init (braced_init_obstack);
} }
} }
add_pending_init (field, value, origtype, implicit); add_pending_init (field, value, origtype, implicit,
braced_init_obstack);
return; return;
} }
else if (TREE_CODE (constructor_type) == UNION_TYPE else if (TREE_CODE (constructor_type) == UNION_TYPE
...@@ -7621,7 +7642,7 @@ output_init_element (tree value, tree origtype, bool strict_string, tree type, ...@@ -7621,7 +7642,7 @@ output_init_element (tree value, tree origtype, bool strict_string, tree type,
/* Now output any pending elements which have become next. */ /* Now output any pending elements which have become next. */
if (pending) if (pending)
output_pending_init_elements (0); output_pending_init_elements (0, braced_init_obstack);
} }
/* Output any pending elements which have become next. /* Output any pending elements which have become next.
...@@ -7634,9 +7655,8 @@ output_init_element (tree value, tree origtype, bool strict_string, tree type, ...@@ -7634,9 +7655,8 @@ output_init_element (tree value, tree origtype, bool strict_string, tree type,
If ALL is 1, we output space as necessary so that If ALL is 1, we output space as necessary so that
we can output all the pending elements. */ we can output all the pending elements. */
static void static void
output_pending_init_elements (int all) output_pending_init_elements (int all, struct obstack * braced_init_obstack)
{ {
struct init_node *elt = constructor_pending_elts; struct init_node *elt = constructor_pending_elts;
tree next; tree next;
...@@ -7657,7 +7677,8 @@ output_pending_init_elements (int all) ...@@ -7657,7 +7677,8 @@ output_pending_init_elements (int all)
constructor_unfilled_index)) constructor_unfilled_index))
output_init_element (elt->value, elt->origtype, true, output_init_element (elt->value, elt->origtype, true,
TREE_TYPE (constructor_type), TREE_TYPE (constructor_type),
constructor_unfilled_index, 0, false); constructor_unfilled_index, 0, false,
braced_init_obstack);
else if (tree_int_cst_lt (constructor_unfilled_index, else if (tree_int_cst_lt (constructor_unfilled_index,
elt->purpose)) elt->purpose))
{ {
...@@ -7711,7 +7732,8 @@ output_pending_init_elements (int all) ...@@ -7711,7 +7732,8 @@ output_pending_init_elements (int all)
constructor_unfilled_fields = elt->purpose; constructor_unfilled_fields = elt->purpose;
output_init_element (elt->value, elt->origtype, true, output_init_element (elt->value, elt->origtype, true,
TREE_TYPE (elt->purpose), TREE_TYPE (elt->purpose),
elt->purpose, 0, false); elt->purpose, 0, false,
braced_init_obstack);
} }
else if (tree_int_cst_lt (ctor_unfilled_bitpos, elt_bitpos)) else if (tree_int_cst_lt (ctor_unfilled_bitpos, elt_bitpos))
{ {
...@@ -7782,7 +7804,8 @@ output_pending_init_elements (int all) ...@@ -7782,7 +7804,8 @@ output_pending_init_elements (int all)
existing initializer. */ existing initializer. */
void void
process_init_element (struct c_expr value, bool implicit) process_init_element (struct c_expr value, bool implicit,
struct obstack * braced_init_obstack)
{ {
tree orig_value = value.value; tree orig_value = value.value;
int string_flag = orig_value != 0 && TREE_CODE (orig_value) == STRING_CST; int string_flag = orig_value != 0 && TREE_CODE (orig_value) == STRING_CST;
...@@ -7823,13 +7846,15 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -7823,13 +7846,15 @@ process_init_element (struct c_expr value, bool implicit)
if ((TREE_CODE (constructor_type) == RECORD_TYPE if ((TREE_CODE (constructor_type) == RECORD_TYPE
|| TREE_CODE (constructor_type) == UNION_TYPE) || TREE_CODE (constructor_type) == UNION_TYPE)
&& constructor_fields == 0) && constructor_fields == 0)
process_init_element (pop_init_level (1), true); process_init_element (pop_init_level (1, braced_init_obstack),
true, braced_init_obstack);
else if ((TREE_CODE (constructor_type) == ARRAY_TYPE else if ((TREE_CODE (constructor_type) == ARRAY_TYPE
|| TREE_CODE (constructor_type) == VECTOR_TYPE) || TREE_CODE (constructor_type) == VECTOR_TYPE)
&& (constructor_max_index == 0 && (constructor_max_index == 0
|| tree_int_cst_lt (constructor_max_index, || tree_int_cst_lt (constructor_max_index,
constructor_index))) constructor_index)))
process_init_element (pop_init_level (1), true); process_init_element (pop_init_level (1, braced_init_obstack),
true, braced_init_obstack);
else else
break; break;
} }
...@@ -7899,7 +7924,7 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -7899,7 +7924,7 @@ process_init_element (struct c_expr value, bool implicit)
&& (fieldcode == RECORD_TYPE || fieldcode == ARRAY_TYPE && (fieldcode == RECORD_TYPE || fieldcode == ARRAY_TYPE
|| fieldcode == UNION_TYPE || fieldcode == VECTOR_TYPE)) || fieldcode == UNION_TYPE || fieldcode == VECTOR_TYPE))
{ {
push_init_level (1); push_init_level (1, braced_init_obstack);
continue; continue;
} }
...@@ -7908,7 +7933,8 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -7908,7 +7933,8 @@ process_init_element (struct c_expr value, bool implicit)
push_member_name (constructor_fields); push_member_name (constructor_fields);
output_init_element (value.value, value.original_type, output_init_element (value.value, value.original_type,
strict_string, fieldtype, strict_string, fieldtype,
constructor_fields, 1, implicit); constructor_fields, 1, implicit,
braced_init_obstack);
RESTORE_SPELLING_DEPTH (constructor_depth); RESTORE_SPELLING_DEPTH (constructor_depth);
} }
else else
...@@ -7990,7 +8016,7 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -7990,7 +8016,7 @@ process_init_element (struct c_expr value, bool implicit)
&& (fieldcode == RECORD_TYPE || fieldcode == ARRAY_TYPE && (fieldcode == RECORD_TYPE || fieldcode == ARRAY_TYPE
|| fieldcode == UNION_TYPE || fieldcode == VECTOR_TYPE)) || fieldcode == UNION_TYPE || fieldcode == VECTOR_TYPE))
{ {
push_init_level (1); push_init_level (1, braced_init_obstack);
continue; continue;
} }
...@@ -7999,7 +8025,8 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -7999,7 +8025,8 @@ process_init_element (struct c_expr value, bool implicit)
push_member_name (constructor_fields); push_member_name (constructor_fields);
output_init_element (value.value, value.original_type, output_init_element (value.value, value.original_type,
strict_string, fieldtype, strict_string, fieldtype,
constructor_fields, 1, implicit); constructor_fields, 1, implicit,
braced_init_obstack);
RESTORE_SPELLING_DEPTH (constructor_depth); RESTORE_SPELLING_DEPTH (constructor_depth);
} }
else else
...@@ -8031,7 +8058,7 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -8031,7 +8058,7 @@ process_init_element (struct c_expr value, bool implicit)
&& (eltcode == RECORD_TYPE || eltcode == ARRAY_TYPE && (eltcode == RECORD_TYPE || eltcode == ARRAY_TYPE
|| eltcode == UNION_TYPE || eltcode == VECTOR_TYPE)) || eltcode == UNION_TYPE || eltcode == VECTOR_TYPE))
{ {
push_init_level (1); push_init_level (1, braced_init_obstack);
continue; continue;
} }
...@@ -8050,7 +8077,8 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -8050,7 +8077,8 @@ process_init_element (struct c_expr value, bool implicit)
push_array_bounds (tree_low_cst (constructor_index, 1)); push_array_bounds (tree_low_cst (constructor_index, 1));
output_init_element (value.value, value.original_type, output_init_element (value.value, value.original_type,
strict_string, elttype, strict_string, elttype,
constructor_index, 1, implicit); constructor_index, 1, implicit,
braced_init_obstack);
RESTORE_SPELLING_DEPTH (constructor_depth); RESTORE_SPELLING_DEPTH (constructor_depth);
} }
...@@ -8084,7 +8112,8 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -8084,7 +8112,8 @@ process_init_element (struct c_expr value, bool implicit)
elttype = TYPE_MAIN_VARIANT (constructor_type); elttype = TYPE_MAIN_VARIANT (constructor_type);
output_init_element (value.value, value.original_type, output_init_element (value.value, value.original_type,
strict_string, elttype, strict_string, elttype,
constructor_index, 1, implicit); constructor_index, 1, implicit,
braced_init_obstack);
} }
constructor_index constructor_index
...@@ -8112,7 +8141,8 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -8112,7 +8141,8 @@ process_init_element (struct c_expr value, bool implicit)
if (value.value) if (value.value)
output_init_element (value.value, value.original_type, output_init_element (value.value, value.original_type,
strict_string, constructor_type, strict_string, constructor_type,
NULL_TREE, 1, implicit); NULL_TREE, 1, implicit,
braced_init_obstack);
constructor_fields = 0; constructor_fields = 0;
} }
...@@ -8128,14 +8158,17 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -8128,14 +8158,17 @@ process_init_element (struct c_expr value, bool implicit)
while (constructor_stack != range_stack->stack) while (constructor_stack != range_stack->stack)
{ {
gcc_assert (constructor_stack->implicit); gcc_assert (constructor_stack->implicit);
process_init_element (pop_init_level (1), true); process_init_element (pop_init_level (1,
braced_init_obstack),
true, braced_init_obstack);
} }
for (p = range_stack; for (p = range_stack;
!p->range_end || tree_int_cst_equal (p->index, p->range_end); !p->range_end || tree_int_cst_equal (p->index, p->range_end);
p = p->prev) p = p->prev)
{ {
gcc_assert (constructor_stack->implicit); gcc_assert (constructor_stack->implicit);
process_init_element (pop_init_level (1), true); process_init_element (pop_init_level (1, braced_init_obstack),
true, braced_init_obstack);
} }
p->index = size_binop_loc (input_location, p->index = size_binop_loc (input_location,
...@@ -8155,7 +8188,7 @@ process_init_element (struct c_expr value, bool implicit) ...@@ -8155,7 +8188,7 @@ process_init_element (struct c_expr value, bool implicit)
p = p->next; p = p->next;
if (!p) if (!p)
break; break;
push_init_level (2); push_init_level (2, braced_init_obstack);
p->stack = constructor_stack; p->stack = constructor_stack;
if (p->range_end && tree_int_cst_equal (p->index, p->range_end)) if (p->range_end && tree_int_cst_equal (p->index, p->range_end))
p->index = p->range_start; p->index = p->range_start;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment