diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 3d811375a9af335c7ccaca9c53a99bc926eb9f7c..49bfd3df3744404d7a77bf01600e709ad9cb87ab 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-20  Andrew Haley  <aph@redhat.com>
+
+	* jcf-parse.c (parse_class_file): Set input_location from
+	current_class.
+
 2006-02-15  Andrew Haley  <aph@redhat.com>
 
 	* class.c (GEN_TABLE): Don't pushdecl *_SYMS_DECL here.
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 552c04ac94321a1a28c7e020f0b5a1c4b8e0fa92..b9d52b61f8c86c75f0c5874a137b8ce391f280b4 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -898,7 +898,7 @@ parse_class_file (void)
 	  continue;
 	}
 
-      input_location = file_start_location;
+      input_location = DECL_SOURCE_LOCATION (TYPE_NAME (current_class));
       if (DECL_LINENUMBERS_OFFSET (method))
 	{
 	  int i;