c-common.h (genrtl_begin_compound_stmt): Remove declaration.

2000-07-02  Benjamin Chelf  <chelf@codesourcery.com>

	* c-common.h (genrtl_begin_compound_stmt): Remove declaration.
	(genrtl_finish_compound_stmt): Likewise.
	(genrtl_compound_stmt): Change to return void.

	* c-semantics.c (genrtl_begin_compound_stmt): Remove function and
	move code from here to ...
	(genrtl_compound_stmt): ... here.
	(genrtl_finish_compound_stmt): Remove.
	(expand_stmt): Add comment.

	* cp/cp-tree.h (genrtl_goto_stmt): Remove declaration.
	(genrtl_expr_stmt): Likewise.
	(genrtl_decl_stmt): Likewise.
	(genrtl_if_stmt): Likewise.
	(genrtl_while_stmt): Likewise.
	(genrtl_do_stmt): Likewise.
	(genrtl_return_stmt): Likewise.
	(genrtl_for_stmt): Likewise.
	(genrtl_break_stmt): Likewise.
	(genrtl_continue_stmt): Likewise.
	(genrtl_scope_stmt): Likewise.
	(genrtl_switch_stmt): Likewise.
	(genrtl_case_label): Likewise.
	(genrtl_begin_compound_stmt): Likewise.
	(genrtl_finish_compound_stmt): Likewise.
	(genrtl_compound_stmt): Likewise.
	(genrtl_asm_stmt): Likewise.

	* cp/init.c (begin_init_stmts): Remove call to
	genrtl_begin_compound_stmt.
	(finish_init_stmts): Remove call to genrtl_finish_compound_stmt.

	* cp/semantics.c (lang_expand_stmt): Changed call to
	genrtl_compound_stmt to ignore return value.

From-SVN: r34837
This commit is contained in:
Benjamin Chelf 2000-07-03 03:55:23 +00:00 committed by Ben Chelf
parent cd9bedad01
commit 4cf88f570a
7 changed files with 53 additions and 52 deletions

View File

@ -1,3 +1,15 @@
2000-07-02 Benjamin Chelf <chelf@codesourcery.com>
* c-common.h (genrtl_begin_compound_stmt): Remove declaration.
(genrtl_finish_compound_stmt): Likewise.
(genrtl_compound_stmt): Change to return void.
* c-semantics.c (genrtl_begin_compound_stmt): Remove function and
move code from here to ...
(genrtl_compound_stmt): ... here.
(genrtl_finish_compound_stmt): Remove.
(expand_stmt): Add comment.
2000-07-02 Zack Weinberg <zack@wolery.cumb.org>
* c-typeck.c (build_indirect_ref): Use COMPLETE_OR_VOID_TYPE_P

View File

@ -435,9 +435,7 @@ extern void genrtl_continue_stmt PARAMS ((void));
extern void genrtl_scope_stmt PARAMS ((tree));
extern void genrtl_switch_stmt PARAMS ((tree));
extern void genrtl_case_label PARAMS ((tree, tree));
extern tree genrtl_begin_compound_stmt PARAMS ((int));
extern tree genrtl_finish_compound_stmt PARAMS ((int));
extern tree genrtl_compound_stmt PARAMS ((tree));
extern void genrtl_compound_stmt PARAMS ((tree));
extern void genrtl_asm_stmt PARAMS ((tree, tree,
tree, tree,
tree));

View File

@ -398,42 +398,23 @@ genrtl_case_label (low_value, high_value)
do_case (low_value, high_value);
}
/* Generate the RTL for the start of a COMPOUND_STMT. */
/* Generate the RTL for T, which is a COMPOUND_STMT. */
tree
genrtl_begin_compound_stmt (has_no_scope)
int has_no_scope;
void
genrtl_compound_stmt (t)
tree t;
{
/* If this is the outermost block of the function, declare the
variables __FUNCTION__, __PRETTY_FUNCTION__, and so forth. */
if (cfun
&& !current_function_name_declared ()
&& !has_no_scope)
&& !COMPOUND_STMT_NO_SCOPE (t))
{
set_current_function_name_declared (1);
declare_function_name ();
}
}
return NULL_TREE;
}
/* Generate the RTL for the end of a COMPOUND_STMT. */
tree genrtl_finish_compound_stmt (has_no_scope)
int has_no_scope;
{
return NULL_TREE;
}
/* Generate the RTL for T, which is a COMPOUND_STMT. */
tree
genrtl_compound_stmt (t)
tree t;
{
genrtl_begin_compound_stmt (COMPOUND_STMT_NO_SCOPE (t));
expand_stmt (COMPOUND_BODY (t));
return (genrtl_finish_compound_stmt (COMPOUND_STMT_NO_SCOPE (t)));
}
/* Generate the RTL for an ASM_STMT. */
@ -481,6 +462,9 @@ genrtl_decl_cleanup (decl, cleanup)
expand_decl_cleanup (decl, cleanup);
}
/* Generate the RTL for the statement T, its substatements, and any
other statements at its nesting level. */
tree
expand_stmt (t)
tree t;
@ -489,3 +473,4 @@ expand_stmt (t)
rval = lang_expand_stmt (t);
return rval;
}

View File

@ -1,3 +1,30 @@
2000-07-02 Benjamin Chelf <chelf@codesourcery.com>
* cp-tree.h (genrtl_goto_stmt): Remove declaration.
(genrtl_expr_stmt): Likewise.
(genrtl_decl_stmt): Likewise.
(genrtl_if_stmt): Likewise.
(genrtl_while_stmt): Likewise.
(genrtl_do_stmt): Likewise.
(genrtl_return_stmt): Likewise.
(genrtl_for_stmt): Likewise.
(genrtl_break_stmt): Likewise.
(genrtl_continue_stmt): Likewise.
(genrtl_scope_stmt): Likewise.
(genrtl_switch_stmt): Likewise.
(genrtl_case_label): Likewise.
(genrtl_begin_compound_stmt): Likewise.
(genrtl_finish_compound_stmt): Likewise.
(genrtl_compound_stmt): Likewise.
(genrtl_asm_stmt): Likewise.
* init.c (begin_init_stmts): Remove call to
genrtl_begin_compound_stmt.
(finish_init_stmts): Remove call to genrtl_finish_compound_stmt.
* semantics.c (lang_expand_stmt): Changed call to
genrtl_compound_stmt to ignore return value.
2000-07-02 Mark Mitchell <mark@codesourcery.com>
* mangle.c (canonicalize_for_substitution): Return the canonical

View File

@ -4464,25 +4464,6 @@ extern void genrtl_ctor_stmt PARAMS ((tree));
extern void genrtl_subobject PARAMS ((tree));
extern tree genrtl_do_poplevel PARAMS ((void));
extern void clear_out_block PARAMS ((void));
extern void genrtl_goto_stmt PARAMS ((tree));
extern void genrtl_expr_stmt PARAMS ((tree));
extern void genrtl_decl_stmt PARAMS ((tree));
extern void genrtl_if_stmt PARAMS ((tree));
extern void genrtl_while_stmt PARAMS ((tree));
extern void genrtl_do_stmt PARAMS ((tree));
extern void genrtl_return_stmt PARAMS ((tree));
extern void genrtl_for_stmt PARAMS ((tree));
extern void genrtl_break_stmt PARAMS ((void));
extern void genrtl_continue_stmt PARAMS ((void));
extern void genrtl_scope_stmt PARAMS ((tree));
extern void genrtl_switch_stmt PARAMS ((tree));
extern void genrtl_case_label PARAMS ((tree, tree));
extern tree genrtl_begin_compound_stmt PARAMS ((int));
extern tree genrtl_finish_compound_stmt PARAMS ((int));
extern tree genrtl_compound_stmt PARAMS ((tree));
extern void genrtl_asm_stmt PARAMS ((tree, tree,
tree, tree,
tree));
extern void genrtl_named_return_value PARAMS ((tree,
tree));
extern tree begin_global_stmt_expr PARAMS ((void));

View File

@ -98,8 +98,8 @@ begin_init_stmts (stmt_expr_p, compound_stmt_p)
if (building_stmt_tree ())
*compound_stmt_p = begin_compound_stmt (/*has_no_scope=*/1);
else
*compound_stmt_p = genrtl_begin_compound_stmt (/*has_no_scope=*/1);
// else
// *compound_stmt_p = genrtl_begin_compound_stmt (has_no_scope=1);
}
/* Finish out the statement-expression begun by the previous call to
@ -113,8 +113,6 @@ finish_init_stmts (stmt_expr, compound_stmt)
{
if (building_stmt_tree ())
finish_compound_stmt (/*has_no_scope=*/1, compound_stmt);
else
genrtl_finish_compound_stmt (/*has_no_scope=*/1);
if (building_stmt_tree ())
stmt_expr = finish_stmt_expr (stmt_expr);

View File

@ -2362,7 +2362,7 @@ lang_expand_stmt (t)
break;
case COMPOUND_STMT:
rval = genrtl_compound_stmt (t);
genrtl_compound_stmt (t);
break;
case BREAK_STMT: