From d3b54e63f4866551953a03f512049741b0e776c4 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Fri, 5 Feb 2021 09:14:25 +0100 Subject: [PATCH] [gdb/symtab] Fix duplicate CUs in create_cus_from_debug_names_list When running test-case gdb.dwarf2/clang-debug-names.exp, I run into the following warning: ... (gdb) file clang-debug-names^M Reading symbols from clang-debug-names...^M warning: Section .debug_aranges in clang-debug-names has duplicate \ debug_info_offset 0xc7, ignoring .debug_aranges.^M ... This is caused by a missing return in commit 3ee6bb113af "[gdb/symtab] Fix incomplete CU list assert in .debug_names". Fix this by adding the missing return, such that we have instead this warning: ... (gdb) file clang-debug-names^M Reading symbols from clang-debug-names...^M warning: Section .debug_aranges in clang-debug-names \ entry at offset 0 debug_info_offset 0 does not exists, \ ignoring .debug_aranges.^M ... which is a known problem filed as PR25969 - "Ignoring .debug_aranges with clang .debug_names". Tested on x86_64-linux. gdb/ChangeLog: 2021-02-05 Tom de Vries PR symtab/27307 * dwarf2/read.c (create_cus_from_debug_names_list): Add missing return. gdb/testsuite/ChangeLog: 2021-02-05 Tom de Vries PR symtab/27307 * gdb.dwarf2/clang-debug-names.exp: Check file command warnings. --- gdb/ChangeLog | 6 ++++++ gdb/dwarf2/read.c | 1 + gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.dwarf2/clang-debug-names.exp | 16 ++++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 75584a794b1..94b5c7ae12b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2021-02-05 Tom de Vries + + PR symtab/27307 + * dwarf2/read.c (create_cus_from_debug_names_list): Add missing + return. + 2021-02-05 Tom de Vries * dwarf2/read.c (create_cus_from_debug_names_list): Fix indentation. diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index eb058510867..f60e418172c 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -5350,6 +5350,7 @@ create_cus_from_debug_names_list (dwarf2_per_bfd *per_bfd, sect_off, 0); per_bfd->all_comp_units.push_back (per_cu); } + return; } sect_offset sect_off_prev; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a449de04587..01539a62248 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2021-02-05 Tom de Vries + + PR symtab/27307 + * gdb.dwarf2/clang-debug-names.exp: Check file command warnings. + 2021-02-04 Shahab Vahedi * gdb.xml/tdesc-regs.exp: Use correct core-regs for ARC. diff --git a/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp b/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp index 12134cf7f3e..5548b30e771 100644 --- a/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp +++ b/gdb/testsuite/gdb.dwarf2/clang-debug-names.exp @@ -33,6 +33,22 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \ return -1 } +set test "no file command warnings" +if { [regexp "warning: " $gdb_file_cmd_msg] } { + set kfail_re \ + [concat \ + "warning: Section .debug_aranges in \[^\r\n\]* entry" \ + "at offset 0 debug_info_offset 0 does not exists," \ + "ignoring \\.debug_aranges\\."] + if { [regexp $kfail_re $gdb_file_cmd_msg] } { + kfail symtab/25969 $test + } else { + fail $test + } +} else { + pass $test +} + set cmd "ptype main" set pass_re \ [multi_line \ -- 2.30.2