Skip to content

R
riscv-gcc-1
Commit f01b0acb by Mark Mitchell Committed by Mark Mitchell
Options

cp-tree.h (minimal_parse_mode): Remove. 

	* cp-tree.h (minimal_parse_mode): Remove.
	(finish_label_stmt): New function.
	* decl.c (saved_scope): Remove minimal parse mode.
	(maybe_push_to_top_level): Don't save it.
	(pop_from_top_level): Don't restore it.
	(define_label): Split out template-handling code to semantics.c.
	(start_decl): Don't use minimal_parse_mode.
	(cp_finish_decl): Likewise.
	(start_function): Don't increment it.
	(store_return_init): Don't use it.
	(finish_function): Don't decrement it.
	* parse.y (label_colon): Use finish_label_stmt throughout.
	* parse.c: Regenerated.
	* pt.c (minimal_parse_mode): Don't define it.
	(tsubst_expr): Use finish_label_stmt.
	* semantics.c (finish_label_stmt): New function.

From-SVN: r28682
parent cf7cf3d2
Showing with 57 additions and 44 deletions
gcc/cp/ChangeLog
1999-08-11 Mark Mitchell <mark@codesourcery.com>
* cp-tree.h (minimal_parse_mode): Remove.
(finish_label_stmt): New function.
* decl.c (saved_scope): Remove minimal parse mode.
(maybe_push_to_top_level): Don't save it.
(pop_from_top_level): Don't restore it.
(define_label): Split out template-handling code to semantics.c.
(start_decl): Don't use minimal_parse_mode.
(cp_finish_decl): Likewise.
(start_function): Don't increment it.
(store_return_init): Don't use it.
(finish_function): Don't decrement it.
* parse.y (label_colon): Use finish_label_stmt throughout.
* parse.c: Regenerated.
* pt.c (minimal_parse_mode): Don't define it.
(tsubst_expr): Use finish_label_stmt.
* semantics.c (finish_label_stmt): New function.
* dump.c (queue): Be careful when computing bitmasks.
(dequeue_and_dump): Describe binfos as binfos, not as
vectors.
......
gcc/cp/cp-tree.h
......@@ -2262,8 +2262,6 @@ struct tinst_level
struct tinst_level *next;
};
extern int minimal_parse_mode;
extern void maybe_print_template_context PROTO ((void));
/* in class.c */
......@@ -3305,6 +3303,7 @@ extern void finish_handler PROTO((tree));
extern tree begin_compound_stmt PROTO((int));
extern tree finish_compound_stmt PROTO((int, tree));
extern void finish_asm_stmt PROTO((tree, tree, tree, tree, tree));
extern void finish_label_stmt PROTO((tree));
extern tree finish_parenthesized_expr PROTO((tree));
extern tree begin_stmt_expr PROTO((void));
extern tree finish_stmt_expr PROTO((tree, tree));
......
gcc/cp/decl.c
......@@ -2390,7 +2390,6 @@ struct saved_scope {
struct binding_level *class_bindings;
tree *lang_base, *lang_stack, lang_name;
int lang_stacksize;
int minimal_parse_mode;
tree last_function_parms;
tree template_parms;
HOST_WIDE_INT processing_template_decl;
......@@ -2509,7 +2508,6 @@ maybe_push_to_top_level (pseudo)
s->lang_base = current_lang_base;
s->lang_stacksize = current_lang_stacksize;
s->lang_name = current_lang_name;
s->minimal_parse_mode = minimal_parse_mode;
s->last_function_parms = last_function_parms;
s->template_parms = current_template_parms;
s->processing_template_decl = processing_template_decl;
......@@ -2529,7 +2527,6 @@ maybe_push_to_top_level (pseudo)
strict_prototype = strict_prototypes_lang_cplusplus;
named_labels = NULL_TREE;
shadowed_labels = NULL_TREE;
minimal_parse_mode = 0;
previous_class_type = previous_class_values = NULL_TREE;
class_cache_firstobj = 0;
processing_specialization = 0;
......@@ -2595,7 +2592,6 @@ pop_from_top_level ()
strict_prototype = strict_prototypes_lang_cplusplus;
else if (current_lang_name == lang_name_c)
strict_prototype = strict_prototypes_lang_c;
minimal_parse_mode = s->minimal_parse_mode;
last_function_parms = s->last_function_parms;
current_template_parms = s->template_parms;
processing_template_decl = s->processing_template_decl;
......@@ -4825,20 +4821,7 @@ define_label (filename, line, name)
int line;
tree name;
{
tree decl;
if (minimal_parse_mode)
{
push_obstacks (&permanent_obstack, &permanent_obstack);
decl = build_decl (LABEL_DECL, name, void_type_node);
pop_obstacks ();
DECL_SOURCE_LINE (decl) = line;
DECL_SOURCE_FILE (decl) = filename;
add_tree (decl);
return decl;
}
decl = lookup_label (name);
tree decl = lookup_label (name);
/* After labels, make any new cleanups go into their
own new (temporary) binding contour. */
......@@ -7027,7 +7010,7 @@ start_decl (declarator, declspecs, initialized, attributes, prefix_attributes)
{
if (! current_function_decl)
tem = push_template_decl (tem);
else if (minimal_parse_mode)
else
DECL_VINDEX (tem)
= build_min_nt (DECL_STMT, copy_to_permanent (declarator),
copy_to_permanent (declspecs),
......@@ -7398,7 +7381,7 @@ cp_finish_decl (decl, init, asmspec_tree, need_pop, flags)
{
if (init && DECL_INITIAL (decl))
DECL_INITIAL (decl) = init;
if (minimal_parse_mode && ! DECL_ARTIFICIAL (decl))
if (current_function_decl && ! DECL_ARTIFICIAL (decl))
{
tree stmt = DECL_VINDEX (decl);
/* If the decl is declaring a member of a local class (in a
......@@ -13172,11 +13155,8 @@ start_function (declspecs, declarator, attrs, pre_parsed_p)
temporary_allocation ();
if (processing_template_decl)
{
++minimal_parse_mode;
last_tree = DECL_SAVED_TREE (decl1)
= build_nt (EXPR_STMT, void_zero_node);
}
last_tree = DECL_SAVED_TREE (decl1)
= build_nt (EXPR_STMT, void_zero_node);
++function_depth;
......@@ -13420,7 +13400,7 @@ store_return_init (return_id, init)
DECL_INITIAL (decl) = init;
pushdecl (decl);
if (minimal_parse_mode)
if (processing_template_decl && current_function_decl)
add_tree (build_min_nt (RETURN_INIT, return_id,
copy_to_permanent (init)));
else
......@@ -13872,7 +13852,6 @@ finish_function (lineno, flags, nested)
until we do an instantiation. */
if (processing_template_decl)
{
--minimal_parse_mode;
DECL_SAVED_TREE (fndecl) = TREE_CHAIN (DECL_SAVED_TREE (fndecl));
/* We have to save this value here in case
maybe_end_member_template_processing decides to pop all the
......
gcc/cp/parse.y
......@@ -3397,18 +3397,13 @@ handler_args:
label_colon:
IDENTIFIER ':'
{ tree label;
do_label:
label = define_label (input_filename, lineno, $1);
if (label && ! minimal_parse_mode)
expand_label (label);
}
{ finish_label_stmt ($1); }
| PTYPENAME ':'
{ goto do_label; }
{ finish_label_stmt ($1); }
| TYPENAME ':'
{ goto do_label; }
{ finish_label_stmt ($1); }
| SELFNAME ':'
{ goto do_label; }
{ finish_label_stmt ($1); }
;
for.init.statement:
......
gcc/cp/pt.c
......@@ -68,8 +68,6 @@ static tree *template_tail = &pending_templates;
static tree maybe_templates;
static tree *maybe_template_tail = &maybe_templates;
int minimal_parse_mode;
int processing_specialization;
int processing_explicit_instantiation;
int processing_template_parmlist;
......@@ -7233,10 +7231,9 @@ tsubst_expr (t, args, complain, in_decl)
break;
case LABEL_DECL:
t = define_label (DECL_SOURCE_FILE (t), DECL_SOURCE_LINE (t),
DECL_NAME (t));
if (t)
expand_label (t);
lineno = DECL_SOURCE_LINE (t);
input_filename = DECL_SOURCE_FILE (t);
finish_label_stmt (DECL_NAME (t));
break;
case GOTO_STMT:
......
gcc/cp/semantics.c
......@@ -832,6 +832,32 @@ finish_asm_stmt (cv_qualifier, string, output_operands,
}
}
/* Finish a label with the indicated NAME. */
void
finish_label_stmt (name)
tree name;
{
tree decl;
if (processing_template_decl)
{
push_obstacks_nochange ();
end_temporary_allocation ();
decl = build_decl (LABEL_DECL, name, void_type_node);
pop_obstacks ();
DECL_SOURCE_LINE (decl) = lineno;
DECL_SOURCE_FILE (decl) = input_filename;
add_tree (decl);
}
else
{
decl = define_label (input_filename, lineno, name);
if (decl)
expand_label (decl);
}
}
/* Finish a parenthesized expression EXPR. */
tree
......
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