aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorNathan Froyd <froydnj@codesourcery.com>2011-04-14 11:18:40 +0000
committerNathan Froyd <froydnj@gcc.gnu.org>2011-04-14 11:18:40 +0000
commit61e46a7d5e8031930c341dc122ba614d6970886b (patch)
tree639555a2163347dbebd098a7599ee397b518a58a /gcc/java
parent023009d4d1a7471a5b965af6baf2d721e607fe92 (diff)
downloadgcc-61e46a7d5e8031930c341dc122ba614d6970886b.zip
gcc-61e46a7d5e8031930c341dc122ba614d6970886b.tar.gz
gcc-61e46a7d5e8031930c341dc122ba614d6970886b.tar.bz2
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
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog4
-rw-r--r--gcc/java/decl.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 0c19120..a96b507 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 75f44c9..cb01248 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -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);