PR optimization/12547

        * lang.c (java_tree_inlining_walk_subtrees): Just walk
        BLOCK_EXPR_BODY directly.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73530 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 96d03d0..e06e997 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-12  Jason Merrill  <jason@redhat.com>
+
+       PR optimization/12547
+       * lang.c (java_tree_inlining_walk_subtrees): Just walk
+       BLOCK_EXPR_BODY directly.
+
 2003-11-12  Andrew Haley  <aph@redhat.com>
 
        PR java/11045

diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index a649a4a..c2494da 100644 (file)
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -840,21 +840,14 @@ java_tree_inlining_walk_subtrees (tree *tp ATTRIBUTE_UNUSED,
   switch (code)
     {
     case BLOCK:
-      if (BLOCK_EXPR_BODY (t))
-       {
-         tree *prev = &BLOCK_EXPR_BODY (*tp);
-         while (*prev)
-           {
-             WALK_SUBTREE (*prev);
-             prev = &TREE_CHAIN (*prev);
-           }       
-       }
+      WALK_SUBTREE (BLOCK_EXPR_BODY (t));
       return NULL_TREE;
-      break;
 
     default:
       return NULL_TREE;
     }
+
+  #undef WALK_SUBTREE
 }
 
 /* Called from unsafe_for_reeval.  */