From: Tom de Vries Date: Fri, 5 Feb 2021 16:47:07 +0000 (+0100) Subject: [gdb/symtab] Handle DW_TAG_type_unit in process_psymtab_comp_unit X-Git-Tag: gdb-10.2-release~59 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df3ec334b8ccec482dac01fe2ff12030701da5ee;p=thirdparty%2Fbinutils-gdb.git [gdb/symtab] Handle DW_TAG_type_unit in process_psymtab_comp_unit When running test-case gdb.cp/cpexprs-debug-types.exp with target board unix/gdb:debug_flags=-gdwarf-5, I run into: ... (gdb) file cpexprs-debug-types^M Reading symbols from cpexprs-debug-types...^M ERROR: Couldn't load cpexprs-debug-types into GDB (eof). ERROR: Couldn't send delete breakpoints to GDB. ERROR: GDB process no longer exists GDB process exited with wait status 23054 exp9 0 0 CHILDKILLED SIGABRT SIGABRT ... We're running into this abort in process_psymtab_comp_unit: ... switch (reader.comp_unit_die->tag) { case DW_TAG_compile_unit: this_cu->unit_type = DW_UT_compile; break; case DW_TAG_partial_unit: this_cu->unit_type = DW_UT_partial; break; default: abort (); } ... because reader.comp_unit_die->tag == DW_TAG_type_unit. Fix this by adding a DW_TAG_type_unit case. Tested on x86_64-linux. gdb/ChangeLog: 2021-02-05 Tom de Vries PR symtab/27333 * dwarf2/read.c (process_psymtab_comp_unit): Handle DW_TAG_type_unit. (cherry picked from commit e77b0004dd114d6ddf3bb92b521b2854341f3f85) --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9e70cea3837..1f73b18f8df 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-06 Tom de Vries + + PR symtab/27333 + * dwarf2/read.c (process_psymtab_comp_unit): Handle DW_TAG_type_unit. + 2021-03-04 Simon Marchi PR gdb/27147 diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index df00f01f285..a025f04f48d 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -7708,6 +7708,9 @@ process_psymtab_comp_unit (dwarf2_per_cu_data *this_cu, case DW_TAG_partial_unit: this_cu->unit_type = DW_UT_partial; break; + case DW_TAG_type_unit: + this_cu->unit_type = DW_UT_type; + break; default: abort (); }