diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index bd11ee36953..e5fc36a88b8 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-01  Andrew Haley  <aph@redhat.com>
+
+	PR java/30641
+	* jcf-parse.c (jcf_parse): Clear the field_offsets bitmap.
+
 2007-01-31  Kazu Hirata  <kazu@codesourcery.com>
 
 	* class.c, jcf-parse.c: Fix comment typos.
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 0e2ba8c167b..59b9e89c3af 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -1449,6 +1449,8 @@ jcf_parse (JCF* jcf)
 {
   int i, code;
 
+  bitmap_clear (field_offsets);
+
   if (jcf_parse_preamble (jcf) != 0)
     fatal_error ("not a valid Java .class file");
   code = jcf_parse_constant_pool (jcf);