Skip to content

Commit 9bb9b2f

Browse files
committed
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.
1 parent c90939d commit 9bb9b2f

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

gdb/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2019-03-23 Tom Tromey <tom@tromey.com>
2+
3+
* linespec.c (get_current_search_block): Use
4+
scoped_restore_current_language.
5+
* symmisc.c (dump_symtab): Use scoped_restore_current_language.
6+
17
2019-03-22 Alan Hayward <alan.hayward@arm.com>
28
Jiong Wang <jiong.wang@arm.com>
39

gdb/linespec.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,16 +1190,10 @@ iterate_over_all_matching_symtabs
11901190
static const struct block *
11911191
get_current_search_block (void)
11921192
{
1193-
const struct block *block;
1194-
enum language save_language;
1195-
11961193
/* get_selected_block can change the current language when there is
11971194
no selected frame yet. */
1198-
save_language = current_language->la_language;
1199-
block = get_selected_block (0);
1200-
set_language (save_language);
1201-
1202-
return block;
1195+
scoped_restore_current_language save_language;
1196+
return get_selected_block (0);
12031197
}
12041198

12051199
/* Iterate over static and global blocks. */

gdb/symmisc.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,9 @@ dump_symtab (struct symtab *symtab, struct ui_file *outfile)
384384
if (symtab->language != language_unknown
385385
&& symtab->language != language_auto)
386386
{
387-
enum language saved_lang;
388-
389-
saved_lang = set_language (symtab->language);
390-
387+
scoped_restore_current_language save_lang;
388+
set_language (symtab->language);
391389
dump_symtab_1 (symtab, outfile);
392-
393-
set_language (saved_lang);
394390
}
395391
else
396392
dump_symtab_1 (symtab, outfile);

0 commit comments

Comments
 (0)