From 7693576838f4fe66b2a2380425b5ad950c671b34 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 24 Feb 2020 15:50:57 -0700 Subject: [PATCH] Simplify setting of reading_partial_symbols This simplifies the setting and clearing of reading_partial_symbols, by using scoped_restore in the function that reads partial symbols. gdb/ChangeLog 2020-02-24 Tom Tromey * dwarf2read.c (dwarf2_build_psymtabs_hard): Use make_scoped_restore. (dwarf2_psymtab::read_symtab): Don't clear reading_partial_symbols. --- gdb/ChangeLog | 7 +++++++ gdb/dwarf2/read.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 43ae8e8e36d..044a1920edf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-02-24 Tom Tromey + + * dwarf2read.c (dwarf2_build_psymtabs_hard): Use + make_scoped_restore. + (dwarf2_psymtab::read_symtab): Don't clear + reading_partial_symbols. + 2020-02-24 Tom de Vries PR gdb/25592 diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 46d510eb274..701d19ebb75 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -7718,7 +7718,9 @@ dwarf2_build_psymtabs_hard (struct dwarf2_per_objfile *dwarf2_per_objfile) objfile_name (objfile)); } - dwarf2_per_objfile->reading_partial_symbols = 1; + scoped_restore restore_reading_psyms + = make_scoped_restore (&dwarf2_per_objfile->reading_partial_symbols, + true); dwarf2_per_objfile->info.read (objfile); @@ -8692,8 +8694,6 @@ dwarf2_psymtab::read_symtab (struct objfile *objfile) = dpo_backlink->has_section_at_zero; } - dwarf2_per_objfile->reading_partial_symbols = 0; - expand_psymtab (objfile); process_cu_includes (dwarf2_per_objfile); -- 2.30.2