From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jason Merrill <jason@redhat.com>
To: Bernd Schmidt <bernds@redhat.com>
Cc: Jeffrey A Law <law@cygnus.com>, gcc@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: Re: Question about a varasm change
Date: Fri, 22 Sep 2000 10:56:00 -0000
Message-id: <u9zol02u09.fsf@casey.soma.redhat.com>
References: <Pine.LNX.4.21.0009191633160.1182-100000@mahatma.cygnus.co.uk> <u966np8t21.fsf@casey.soma.redhat.com>
X-SW-Source: 2000-09/msg00544.html

I'm checking this in:

2000-09-22  Jason Merrill  <jason@redhat.com>

	* dbxout.c (dbxout_symbol_name): Just use DECL_NAME for
	function-local names.

Index: dbxout.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/dbxout.c,v
retrieving revision 1.60
diff -c -p -r1.60 dbxout.c
*** dbxout.c	2000/07/23 17:53:21	1.60
--- dbxout.c	2000/09/22 17:52:45
*************** dbxout_symbol_name (decl, suffix, letter
*** 2215,2225 ****
       const char *suffix;
       int letter;
  {
!   /* One slight hitch: if this is a VAR_DECL which is a static
!      class member, we must put out the mangled name instead of the
!      DECL_NAME.  Note also that static member (variable) names DO NOT begin
!      with underscores in .stabs directives.  */
!   const char *name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
    if (name == 0)
      name = "(anon)";
    fprintf (asmfile, "%s \"%s%s:", ASM_STABS_OP, name,
--- 2215,2233 ----
       const char *suffix;
       int letter;
  {
!   const char *name;
! 
!   if (TYPE_P (DECL_CONTEXT (decl)))
!     /* One slight hitch: if this is a VAR_DECL which is a static
!        class member, we must put out the mangled name instead of the
!        DECL_NAME.  Note also that static member (variable) names DO NOT begin
!        with underscores in .stabs directives.  */
!     name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
!   else
!     /* ...but if we're function-local, we don't want to include the junk
!        added by ASM_FORMAT_PRIVATE_NAME.  */
!     name = IDENTIFIER_POINTER (DECL_NAME (decl));
! 
    if (name == 0)
      name = "(anon)";
    fprintf (asmfile, "%s \"%s%s:", ASM_STABS_OP, name,