OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cp-tree.h (genrtl_begin_stmt_expr): Rename to ... 

* cp-tree.h (genrtl_begin_stmt_expr): Rename to ...
	(begin_global_stmt_expr): ... this.
	(genrtl_finish_stmt_expr): Rename to ...
	(finish_global_stmt_expr): ... this.
	* init.c (begin_init_stmts): Adjust calls.
	(finish_init_stmts): Likewise.
	* semantics.c (genrtl_begin_stmt_expr): Rename to ...
	(begin_global_stmt_expr): ... this.
	(genrtl_finish_stmt_expr): Rename to ...
	(finish_global_stmt_expr): ... this.

From-SVN: r34702
This commit is contained in:
Mark Mitchell 2000-06-26 02:18:14 +00:00 committed by Mark Mitchell
parent b42115f711
commit 596fd31c72
4 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/cp/ChangeLog
View File

@ -1,3 +1,16 @@
2000-06-25 Mark Mitchell <mark@codesourcery.com>
* cp-tree.h (genrtl_begin_stmt_expr): Rename to ...
(begin_global_stmt_expr): ... this.
(genrtl_finish_stmt_expr): Rename to ...
(finish_global_stmt_expr): ... this.
* init.c (begin_init_stmts): Adjust calls.
(finish_init_stmts): Likewise.
* semantics.c (genrtl_begin_stmt_expr): Rename to ...
(begin_global_stmt_expr): ... this.
(genrtl_finish_stmt_expr): Rename to ...
(finish_global_stmt_expr): ... this.
2000-06-25 Theodore Papadopoulo <Theodore.Papadopoulo@sophia.inria.fr>
* search.c (lookup_member): Fix typo in comment.

4
gcc/cp/cp-tree.h
View File

@ -4535,8 +4535,8 @@ extern void genrtl_asm_stmt PARAMS ((tree, tree,
tree));
extern void genrtl_named_return_value PARAMS ((tree,
tree));
extern tree genrtl_begin_stmt_expr PARAMS ((void));
extern tree genrtl_finish_stmt_expr PARAMS ((tree));
extern tree begin_global_stmt_expr PARAMS ((void));
extern tree finish_global_stmt_expr PARAMS ((tree));
/* in spew.c */

4
gcc/cp/init.c
View File

@ -100,7 +100,7 @@ begin_init_stmts (stmt_expr_p, compound_stmt_p)
if (building_stmt_tree ())
*stmt_expr_p = begin_stmt_expr ();
else
*stmt_expr_p = genrtl_begin_stmt_expr ();
*stmt_expr_p = begin_global_stmt_expr ();
if (building_stmt_tree ())
*compound_stmt_p = begin_compound_stmt (/*has_no_scope=*/1);
@ -125,7 +125,7 @@ finish_init_stmts (stmt_expr, compound_stmt)
if (building_stmt_tree ())
stmt_expr = finish_stmt_expr (stmt_expr);
else
stmt_expr = genrtl_finish_stmt_expr (stmt_expr);
stmt_expr = finish_global_stmt_expr (stmt_expr);
/* To avoid spurious warnings about unused values, we set
TREE_USED. */

43
gcc/cp/semantics.c
View File

@ -1776,21 +1776,6 @@ finish_parenthesized_expr (expr)
return expr;
}
/* The last_tree will be NULL_TREE when entering this function. Unlike
the other genrtl functions, in this function, that state can change
hence the check at the end as in the original version of
begin_stmt_expr. Generate the RTL for the start of a STMT_EXPR. */
tree
genrtl_begin_stmt_expr ()
{
if (! cfun && !last_tree)
begin_stmt_tree (&scope_chain->x_saved_tree);
keep_next_level (1);
return (last_tree != NULL_TREE) ? last_tree : expand_start_stmt_expr();
}
/* Begin a statement-expression. The value returned must be passed to
finish_stmt_expr. */
@ -1811,22 +1796,34 @@ begin_stmt_expr ()
return last_tree;
}
/* Generate the RTL for the end of the STMT_EXPR. */
/* Used when beginning a statement-expression outside function scope.
For example, when handling a file-scope initializer, we use this
function. */
tree
begin_global_stmt_expr ()
{
if (! cfun && !last_tree)
begin_stmt_tree (&scope_chain->x_saved_tree);
keep_next_level (1);
return (last_tree != NULL_TREE) ? last_tree : expand_start_stmt_expr();
}
/* Finish the STMT_EXPR last begun with begin_global_stmt_expr. */
tree
genrtl_finish_stmt_expr (rtl_expr)
tree rtl_expr;
finish_global_stmt_expr (stmt_expr)
tree stmt_expr;
{
tree result;
rtl_expr = expand_end_stmt_expr (rtl_expr);
result = rtl_expr;
stmt_expr = expand_end_stmt_expr (stmt_expr);
if (! cfun
&& TREE_CHAIN (scope_chain->x_saved_tree) == NULL_TREE)
finish_stmt_tree (&scope_chain->x_saved_tree);
return result;
return stmt_expr;
}
/* Finish a statement-expression. RTL_EXPR should be the value