Commit 61e46a7d by Nathan Froyd Committed by Nathan Froyd

utils.c (gnat_poplevel): Use block_chainon.

gcc/ada/
	* gcc-interface/utils.c (gnat_poplevel): Use block_chainon.

gcc/
	* function.h (block_chainon): Declare.
	* function.c (block_chainon): Define.

gcc/cp/
	* decl.c (poplevel): Use block_chainon.

gcc/fortran//
	* f95-lang.c (poplevel): Use BLOCK_CHAIN and block_chainon.

gcc/java/
	* decl.c (poplevel): Use BLOCK_CHAIN and block_chainon.

From-SVN: r172418
parent 023009d4
2011-04-14 Nathan Froyd <froydnj@codesourcery.com>
* function.h (block_chainon): Declare.
* function.c (block_chainon): Define.
2011-04-14 Anatoly Sokolov <aesok@post.ru>
Eric Weddington <eric.weddington@atmel.com>
Georg-Johann Lay <avr@gjlay.de>
......
2011-04-14 Nathan Froyd <froydnj@codesourcery.com>
* gcc-interface/utils.c (gnat_poplevel): Use block_chainon.
2011-04-12 Nathan Froyd <froydnj@codesourcery.com>
* gcc-interface/ada-tree.h (union lang_tree_node): Check for TS_COMMON
......
......@@ -459,8 +459,8 @@ gnat_poplevel (void)
else if (BLOCK_VARS (block) == NULL_TREE)
{
BLOCK_SUBBLOCKS (level->chain->block)
= chainon (BLOCK_SUBBLOCKS (block),
BLOCK_SUBBLOCKS (level->chain->block));
= block_chainon (BLOCK_SUBBLOCKS (block),
BLOCK_SUBBLOCKS (level->chain->block));
BLOCK_CHAIN (block) = free_block_chain;
free_block_chain = block;
}
......
2011-04-14 Nathan Froyd <froydnj@codesourcery.com>
* decl.c (poplevel): Use block_chainon.
2011-04-13 Jason Merrill <jason@redhat.com>
PR c++/48594
......
......@@ -794,7 +794,7 @@ poplevel (int keep, int reverse, int functionbody)
}
else if (block)
current_binding_level->blocks
= chainon (current_binding_level->blocks, block);
= block_chainon (current_binding_level->blocks, block);
/* If we did not make a block for the level just exited,
any blocks made for inner levels
......@@ -803,7 +803,7 @@ poplevel (int keep, int reverse, int functionbody)
of something else. */
else if (subblocks)
current_binding_level->blocks
= chainon (current_binding_level->blocks, subblocks);
= block_chainon (current_binding_level->blocks, subblocks);
/* Each and every BLOCK node created here in `poplevel' is important
(e.g. for proper debugging information) so if we created one
......
2011-04-14 Nathan Froyd <froydnj@codesourcery.com>
* f95-lang.c (poplevel): Use BLOCK_CHAIN and block_chainon.
2011-04-12 Nathan Froyd <froydnj@codesourcery.com>
* f95-lang.c (union lang_tree_node): Check for TS_COMMON before
......
......@@ -444,7 +444,7 @@ poplevel (int keep, int reverse, int functionbody)
/* Record the BLOCK node just built as the subblock its enclosing scope. */
for (subblock_node = subblock_chain; subblock_node;
subblock_node = TREE_CHAIN (subblock_node))
subblock_node = BLOCK_CHAIN (subblock_node))
BLOCK_SUPERCONTEXT (subblock_node) = block_node;
/* Clear out the meanings of the local variables of this level. */
......@@ -475,7 +475,7 @@ poplevel (int keep, int reverse, int functionbody)
else if (block_node)
{
current_binding_level->blocks
= chainon (current_binding_level->blocks, block_node);
= block_chainon (current_binding_level->blocks, block_node);
}
/* If we did not make a block for the level just exited, any blocks made for
......@@ -484,7 +484,7 @@ poplevel (int keep, int reverse, int functionbody)
else. */
else if (subblock_chain)
current_binding_level->blocks
= chainon (current_binding_level->blocks, subblock_chain);
= block_chainon (current_binding_level->blocks, subblock_chain);
if (block_node)
TREE_USED (block_node) = 1;
......
......@@ -4179,6 +4179,34 @@ blocks_nreverse (tree t)
return prev;
}
/* Concatenate two chains of blocks (chained through BLOCK_CHAIN)
by modifying the last node in chain 1 to point to chain 2. */
tree
block_chainon (tree op1, tree op2)
{
tree t1;
if (!op1)
return op2;
if (!op2)
return op1;
for (t1 = op1; BLOCK_CHAIN (t1); t1 = BLOCK_CHAIN (t1))
continue;
BLOCK_CHAIN (t1) = op2;
#ifdef ENABLE_TREE_CHECKING
{
tree t2;
for (t2 = op2; t2; t2 = BLOCK_CHAIN (t2))
gcc_assert (t2 != t1);
}
#endif
return op1;
}
/* Count the subblocks of the list starting with BLOCK. If VECTOR is
non-NULL, list them all into VECTOR, in a depth-first preorder
traversal of the block tree. Also clear TREE_ASM_WRITTEN in all
......
......@@ -713,6 +713,7 @@ extern void number_blocks (tree);
extern void clear_block_marks (tree);
extern tree blocks_nreverse (tree);
extern tree block_chainon (tree, tree);
/* Return size needed for stack frame based on slots so far allocated.
This size counts from zero. It is not rounded to STACK_BOUNDARY;
......
2011-04-14 Nathan Froyd <froydnj@codesourcery.com>
* decl.c (poplevel): Use BLOCK_CHAIN and block_chainon.
2011-04-12 Nathan Froyd <froydnj@codesourcery.com>
* java-tree.h (union lang_tree_node): Check for TS_COMMON before
......
......@@ -1481,7 +1481,7 @@ poplevel (int keep, int reverse, int functionbody)
/* In each subblock, record that this is its superior. */
for (link = subblocks; link; link = TREE_CHAIN (link))
for (link = subblocks; link; link = BLOCK_CHAIN (link))
BLOCK_SUPERCONTEXT (link) = block;
/* Clear out the meanings of the local variables of this level. */
......@@ -1545,7 +1545,7 @@ poplevel (int keep, int reverse, int functionbody)
if (block)
{
current_binding_level->blocks
= chainon (current_binding_level->blocks, block);
= block_chainon (current_binding_level->blocks, block);
}
/* If we did not make a block for the level just exited,
any blocks made for inner levels
......@@ -1554,7 +1554,7 @@ poplevel (int keep, int reverse, int functionbody)
of something else. */
else if (subblocks)
current_binding_level->blocks
= chainon (current_binding_level->blocks, subblocks);
= block_chainon (current_binding_level->blocks, subblocks);
if (bind)
java_add_stmt (bind);
......
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