From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23871 invoked by alias); 6 Mar 2008 10:36:09 -0000 Received: (qmail 23853 invoked by uid 22791); 6 Mar 2008 10:36:09 -0000 X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 06 Mar 2008 10:35:51 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m26AZnYa008194; Thu, 6 Mar 2008 05:35:49 -0500 Received: from zebedee.pink (vpn-14-25.rdu.redhat.com [10.11.14.25]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m26AZmv2027694; Thu, 6 Mar 2008 05:35:48 -0500 Message-ID: <47CFC903.2050908@redhat.com> Date: Thu, 06 Mar 2008 10:36:00 -0000 From: Andrew Haley User-Agent: Thunderbird 2.0.0.12 (X11/20080213) MIME-Version: 1.0 To: gcc-patches@gcc.gnu.org, java-patches@gcc.gnu.org Subject: Fix Java debuginfo breakage in 4.3 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2008-q1/txt/msg00089.txt.bz2 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 * 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;