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

trans.c (gfc_finish_block, [...]): Build statement lists instead of compound expr chains. 

* trans.c (gfc_finish_block, gfc_add_expr_to_block): Build statement
	lists instead of compound expr chains.
	(gfc_trans_code): Annotate statement lists.

From-SVN: r82604
This commit is contained in:
Paul Brook 2004-06-03 21:56:54 +00:00 committed by Paul Brook
parent 1341376000
commit 7c87eac60d
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2004-05-03 Paul Brook <paul@codesourcery.com>
* trans.c (gfc_finish_block, gfc_add_expr_to_block): Build statement
lists instead of compound expr chains.
(gfc_trans_code): Annotate statement lists.
2004-06-03 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
* trans-array.c: Fix spelling in comments.

28
gcc/fortran/trans.c
View File

@ -215,7 +215,10 @@ gfc_finish_block (stmtblock_t * stmtblock)
tree expr;
tree block;
expr = rationalize_compound_expr (stmtblock->head);
expr = stmtblock->head;
if (!expr)
expr = build_empty_stmt ();
stmtblock->head = NULL_TREE;
if (stmtblock->has_scope)
@ -387,10 +390,23 @@ gfc_add_expr_to_block (stmtblock_t * block, tree expr)
if (expr == NULL_TREE || IS_EMPTY_STMT (expr))
return;
expr = fold (expr);
if (TREE_CODE (expr) != STATEMENT_LIST)
expr = fold (expr);
if (block->head)
block->head = build_v (COMPOUND_EXPR, block->head, expr);
{
if (TREE_CODE (block->head) != STATEMENT_LIST)
{
tree tmp;
tmp = block->head;
block->head = NULL_TREE;
append_to_statement_list (tmp, &block->head);
}
append_to_statement_list (expr, &block->head);
}
else
/* Don't bother creating a list if we only have a single statement. */
block->head = expr;
}
@ -592,7 +608,11 @@ gfc_trans_code (gfc_code * code)
if (res != NULL_TREE && ! IS_EMPTY_STMT (res))
{
annotate_with_locus (res, input_location);
if (TREE_CODE (res) == STATEMENT_LIST)
annotate_all_with_locus (&res, input_location);
else
annotate_with_locus (res, input_location);
/* Add the new statemment to the block. */
gfc_add_expr_to_block (&block, res);
}