Use scoped_restore_current_language in two places

I found a couple of spots that manually saved and restored the current
language.  This patch changes them to use
scoped_restore_current_language.

Tested by the buildbot.

gdb/ChangeLog
2019-03-23  Tom Tromey  <tom@tromey.com>

	* linespec.c (get_current_search_block): Use
	scoped_restore_current_language.
	* symmisc.c (dump_symtab): Use scoped_restore_current_language.
This commit is contained in:
Tom Tromey 2019-03-23 09:43:49 -06:00
parent c90939d2d0
commit 9bb9b2f9d6
3 changed files with 10 additions and 14 deletions

View File

@ -1,3 +1,9 @@
2019-03-23 Tom Tromey <tom@tromey.com>
* linespec.c (get_current_search_block): Use
scoped_restore_current_language.
* symmisc.c (dump_symtab): Use scoped_restore_current_language.
2019-03-22 Alan Hayward <alan.hayward@arm.com>
Jiong Wang <jiong.wang@arm.com>

View File

@ -1190,16 +1190,10 @@ iterate_over_all_matching_symtabs
static const struct block *
get_current_search_block (void)
{
const struct block *block;
enum language save_language;
/* get_selected_block can change the current language when there is
no selected frame yet. */
save_language = current_language->la_language;
block = get_selected_block (0);
set_language (save_language);
return block;
scoped_restore_current_language save_language;
return get_selected_block (0);
}
/* Iterate over static and global blocks. */

View File

@ -384,13 +384,9 @@ dump_symtab (struct symtab *symtab, struct ui_file *outfile)
if (symtab->language != language_unknown
&& symtab->language != language_auto)
{
enum language saved_lang;
saved_lang = set_language (symtab->language);
scoped_restore_current_language save_lang;
set_language (symtab->language);
dump_symtab_1 (symtab, outfile);
set_language (saved_lang);
}
else
dump_symtab_1 (symtab, outfile);