Fix Java debuginfo breakage in 4.3

Fix Java debuginfo breakage in 4.3

[Andrew Haley]

The change to mapped location support broke debuginfo in Java.

The fix is pretty trivial, and I'm putting it into the 4.3 branch.

I suppose I need a test case to make sure this doesn't happen again.
I'm not sure exactly how to write one, though.

Andrew.


2008-03-06  Andrew Haley  <aph@littlepinkcloud.com>

	* jcf-parse.c (give_name_to_class): Call find_sourcefile fo find full
	pathname of source file.

Index: jcf-parse.c
===================================================================
--- jcf-parse.c (revision 131324)
+++ jcf-parse.c (working copy)
@@ -1208,7 +1208,7 @@
 #ifdef USE_MAPPED_LOCATION
       {
       tree source_name = identifier_subst (class_name, "", '.', '/', ".java");
-      const char *sfname = IDENTIFIER_POINTER (source_name);
+      const char *sfname = find_sourcefile (IDENTIFIER_POINTER (source_name));
       linemap_add (line_table, LC_ENTER, false, sfname, 0);
       input_location = linemap_line_start (line_table, 0, 1);
       file_start_location = input_location;

Re: Fix Java debuginfo breakage in 4.3

[Tom Tromey]

>>>>> "Andrew" == Andrew Haley <aph@redhat.com> writes:

Andrew> I suppose I need a test case to make sure this doesn't happen again.
Andrew> I'm not sure exactly how to write one, though.

You could look through the .S, by adding some Tcl code to special.exp
for this case.  Too bad we never set up 'dg' for libjava.

Tom

Re: Fix Java debuginfo breakage in 4.3

[Andrew Haley]

Andrew Haley wrote:
> The change to mapped location support broke debuginfo in Java.
> 
> The fix is pretty trivial, and I'm putting it into the 4.3 branch.
> 
> I suppose I need a test case to make sure this doesn't happen again.
> I'm not sure exactly how to write one, though.

For some reason I didn't check this into the trunk.  I have no idea
why; it is needed.

Andrew.


2008-03-06  Andrew Haley  <aph@littlepinkcloud.com>

	* jcf-parse.c (give_name_to_class): Call find_sourcefile fo find full
	pathname of source file.

Index: jcf-parse.c
===================================================================
--- jcf-parse.c (revision 131324)
+++ jcf-parse.c (working copy)
@@ -1208,7 +1208,7 @@
 #ifdef USE_MAPPED_LOCATION
       {
       tree source_name = identifier_subst (class_name, "", '.', '/', ".java");
-      const char *sfname = IDENTIFIER_POINTER (source_name);
+      const char *sfname = find_sourcefile (IDENTIFIER_POINTER (source_name));
       linemap_add (line_table, LC_ENTER, false, sfname, 0);
       input_location = linemap_line_start (line_table, 0, 1);
       file_start_location = input_location;