From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20806 invoked by alias); 7 Jan 2003 23:14:30 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 20792 invoked from network); 7 Jan 2003 23:14:29 -0000 Received: from unknown (HELO crack.them.org) (65.125.64.184) by 209.249.29.67 with SMTP; 7 Jan 2003 23:14:29 -0000 Received: from nevyn.them.org ([66.93.61.169] ident=mail) by crack.them.org with asmtp (Exim 3.12 #1 (Debian)) id 18W4nV-0006rY-00; Tue, 07 Jan 2003 19:14:22 -0600 Received: from drow by nevyn.them.org with local (Exim 3.36 #1 (Debian)) id 18W2v5-0007ML-00; Tue, 07 Jan 2003 18:14:03 -0500 Date: Tue, 07 Jan 2003 23:14:00 -0000 From: Daniel Jacobowitz To: Elena Zannoni Cc: Adam Fedor , GDB Patches Subject: Re: [RFA] Demangle ObjC symbols in symtab.c [4/5] Message-ID: <20030107231403.GE20617@nevyn.them.org> Mail-Followup-To: Elena Zannoni , Adam Fedor , GDB Patches References: <3E1616B7.1010001@doc.com> <15897.63800.544503.672211@localhost.redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <15897.63800.544503.672211@localhost.redhat.com> User-Agent: Mutt/1.5.1i X-SW-Source: 2003-01/txt/msg00299.txt.bz2 On Mon, Jan 06, 2003 at 04:46:32PM -0500, Elena Zannoni wrote: > Adam Fedor writes: > > 2003-01-03 Adam Fedor > > > > * symtab.c (symbol_init_demangled_name): Check for and demangle > > ObjC symbols. > > (make_symbol_completion_list): Look for ObjC symbols > > > > Index: symtab.c > > =================================================================== > > RCS file: /cvs/src/src/gdb/symtab.c,v > > retrieving revision 1.84 > > diff -u -p -r1.84 symtab.c > > --- symtab.c 2 Jan 2003 14:27:26 -0000 1.84 > > +++ symtab.c 3 Jan 2003 03:20:14 -0000 > > @@ -440,8 +440,18 @@ void > > symbol_init_demangled_name (struct general_symbol_info *gsymbol, > > struct obstack *obstack) > > { > > - char *mangled = gsymbol->name; > > - char *demangled = NULL; > > - > > if (gsymbol->language == language_unknown) > > gsymbol->language = language_auto; > > + > > + if (gsymbol->language == language_objc > > + || gsymbol->language == language_auto) > > + { > > + char *demangled = > > + objc_demangle (gsymbol->name); > > + if (demangled != NULL) > > + { > > + gsymbol->language = language_objc; > > + gsymbol->language_specific.objc_specific.demangled_name = > > + obsavestring (demangled, strlen (demangled), (obstack)); > > + xfree (demangled); > > > > + }+ > ^^^^ ??? I assume it's a cut/paste typo. > > > > > + else > > + { > > + gsymbol->language_specific.objc_specific.demangled_name = NULL; > > + } > > + } > > + > > if (gsymbol->language == language_cplus > > || gsymbol->language == language_auto) > > { > > - demangled = > > + char *demangled = > > cplus_demangle (gsymbol->name, DMGL_PARAMS | DMGL_ANSI); > > if (demangled != NULL) > > { > > @@ -462,9 +478,10 @@ symbol_init_demangled_name (struct gener > > gsymbol->language_specific.cplus_specific.demangled_name = NULL; > > } > > } > > + > > if (gsymbol->language == language_java) > > { > > - demangled = > > + char *demangled = > > cplus_demangle (gsymbol->name, > > DMGL_PARAMS | DMGL_ANSI | DMGL_JAVA); > > if (demangled != NULL) > > @@ -479,6 +496,9 @@ symbol_init_demangled_name (struct gener > > gsymbol->language_specific.cplus_specific.demangled_name = NULL; > > } > > } > > + > > + if (gsymbol->language == language_auto) > > + gsymbol->language = language_unknown; > > Why this? There was a (kind of a) rationale on setting the language to > auto, to speed up some searches. There was a controversy about that > too, and it never got resolved. Do the current C++ people have an opinion? > > See: > http://sources.redhat.com/ml/gdb-patches/2000-09/msg00241.html > > and > http://sources.redhat.com/ml/gdb-patches/2000-10/msg00251.html Well, I'm discussing (off-list) ways to prevent this function from being called multiple times; I haven't worked out how they interact with the file's language yet, however. I need to investigate that some more. I don't like the set back to unknown very much, in principle. And whatever problem Dan was discussing in the messages above appears to be gone, or at least worked around somewhere else. -- Daniel Jacobowitz MontaVista Software Debian GNU/Linux Developer