diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 6cc295f33c71..630e9b828e9e 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-15  Tom Tromey  <tromey@redhat.com>
+
+	* java-tree.h (struct lang_decl_func) <function_decl_body>:
+	Remove.
+	<init_final>: Likewise.
+	* lang.c (java_dump_tree): Update.
+	* java-tree.h (DECL_FUNCTION_BODY): Remove.
+
 2007-09-11  Jan Hubicka <jh@suse.cz>
 
 	* decl.c (java_expand_body): Kill.
diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h
index 95087b785a43..75ccdca65405 100644
--- a/gcc/java/java-tree.h
+++ b/gcc/java/java-tree.h
@@ -722,10 +722,6 @@ union lang_tree_node
 /* List of checked thrown exceptions, as specified with the `throws'
    keyword */
 #define DECL_FUNCTION_THROWS(DECL) (DECL_LANG_SPECIFIC(DECL)->u.f.throws_list)
-/* Pointer to the function's current's COMPOUND_EXPR tree (while
-   completing its body) or the function's block */
-#define DECL_FUNCTION_BODY(DECL) \
-  (DECL_LANG_SPECIFIC(DECL)->u.f.function_decl_body)
 /* For each function decl, init_test_table contains a hash table whose
    entries are keyed on class names, and whose values are local
    boolean decls.  The variables are intended to be TRUE when the
@@ -801,7 +797,6 @@ struct lang_decl_func GTY(())
      only a source_location if USE_MAPPED_LOCATION.  FIXME.  */
   source_location last_line;	/* End line number for a function decl */
   tree throws_list;		/* Exception specified by `throws' */
-  tree function_decl_body;	/* Hold all function's statements */
 
   /* Class initialization test variables  */
   htab_t GTY ((param_is (struct treetreehash_entry))) init_test_table;
@@ -810,7 +805,6 @@ struct lang_decl_func GTY(())
   htab_t GTY ((param_is (union tree_node))) ict;
 
   unsigned int native : 1;	/* Nonzero if this is a native method  */
-  unsigned int init_final : 1;	/* Nonzero all finals are initialized */
   unsigned int strictfp : 1;
   unsigned int invisible : 1;	/* Set for methods we generate
 				   internally but which shouldn't be
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 64b168c650c3..333eb8c32a1b 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -836,8 +836,6 @@ java_dump_tree (void *dump_info, tree t)
 	dump_string (di, "extern");
       else
 	dump_string (di, "static");
-      if (DECL_LANG_SPECIFIC (t))
-	dump_child ("body", DECL_FUNCTION_BODY (t));
       if (DECL_LANG_SPECIFIC (t) && !dump_flag (di, TDF_SLIM, t))
 	dump_child ("inline body", DECL_SAVED_TREE (t));
       return true;