Re: [RFC/RFA] Set current language when dumping symtab

[Joel Brobecker <brobecker@adacore.com>]

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

Humpf, with the patch, this time. Thanks Daniel!

On Mon, May 30, 2005 at 03:45:38PM +1000, Joel Brobecker wrote:
> > > #define TRY_CATCH(EXCEPTION,MASK) \
> > >      { \
> > >        EXCEPTIONS_SIGJMP_BUF *buf = \
> > >          exceptions_state_mc_init (uiout, &(EXCEPTION), (MASK)); \
> > >        EXCEPTIONS_SIGSETJMP (*buf); \
> > >      } \
> > >      while (exceptions_state_mc_action_iter ()) \
> > >        while (exceptions_state_mc_action_iter_1 ())
> > > 
> > > There is a dependency on "uiout". Perhaps it would be better to include
> > > that file from exceptions.h, rather than requiring all clients to include
> > > it themselves? I could send a separate RFA for that.
> > 
> > Yes please.  I figured it was something like that, went looking at the
> > definition, and my eyes skipped right over it.
> 
> Sure. Patch sent, although I can provide the URL yet, as sources.redhat.com
> is unfortunately refusing connections on port 25.  Will send the URL as
> a followup message as soon as the problem is fixed.
> 
> > > > Also, I am not convinced that the new TRY_CATCH is necessary.  The
> > > > only bit likely to throw is print_symbol, which is already wrapped in
> > > > catch_errors.
> > > 
> > > That's true, and I'd be happy to remove it. But I thought that it might
> > > be safer to use it anyway, so that any change underneath that might cause
> > > an exception to be thrown does not affect this code. This is a hard
> > > guaranty that the language will never be changed as a side-effect of
> > > this command.
> 
> Okidoke, understood. New patch attached.
> 
> 2005-05-30  Joel Brobecker  <brobecker@adacore.com>
> 
>         * symmisc.c (dump_symtab_1): Renamed from dump_symtab.
>         (dump_symtab): New function.
> 
> Tested on x86-linux.

-- 
Joel

[-- Attachment #2: symmisc.c.diff --]
[-- Type: text/plain, Size: 1255 bytes --]

Index: symmisc.c
===================================================================
RCS file: /cvs/src/src/gdb/symmisc.c,v
retrieving revision 1.38
diff -u -p -r1.38 symmisc.c
--- symmisc.c	14 Feb 2005 14:37:38 -0000	1.38
+++ symmisc.c	30 May 2005 05:16:41 -0000
@@ -440,8 +440,8 @@ dump_psymtab (struct objfile *objfile, s
 }
 
 static void
-dump_symtab (struct objfile *objfile, struct symtab *symtab,
-	     struct ui_file *outfile)
+dump_symtab_1 (struct objfile *objfile, struct symtab *symtab,
+	       struct ui_file *outfile)
 {
   int i;
   struct dict_iterator iter;
@@ -533,6 +533,23 @@ dump_symtab (struct objfile *objfile, st
     }
 }
 
+static void
+dump_symtab (struct objfile *objfile, struct symtab *symtab,
+	     struct ui_file *outfile)
+{
+  enum language saved_lang;
+  volatile struct gdb_exception except;
+
+  /* Set the current language to the language of the symtab we're dumping
+     because certain routines used during dump_symtab() use the current
+     language to print an image of the symbol.  We'll restore it later.  */
+  saved_lang = set_language (symtab->language);
+
+  dump_symtab_1 (objfile, symtab, outfile);
+
+  set_language (saved_lang);
+}
+
 void
 maintenance_print_symbols (char *args, int from_tty)
 {