diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 9b637bc24d2..f8f5c352617 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-06  Tom Tromey  <tromey@redhat.com>
+
+	* jcf-parse.c (parse_class_file): Re-enter the current file.
+
 2007-09-07  Roman Zippel  <zippel@linux-m68k.org>
 
 	boehm.c (mark_reference_fields): Move misaligned pointer check
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index ff2c9995e8c..a544163c441 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -1586,6 +1586,13 @@ parse_class_file (void)
   java_layout_seen_class_methods ();
 
   input_location = DECL_SOURCE_LOCATION (TYPE_NAME (current_class));
+#ifdef USE_MAPPED_LOCATION
+  {
+    /* Re-enter the current file.  */
+    expanded_location loc = expand_location (input_location);
+    linemap_add (line_table, LC_ENTER, 0, loc.file, loc.line);
+  }
+#endif
   file_start_location = input_location;
   (*debug_hooks->start_source_file) (input_line, input_filename);