From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id C49E43858425; Mon, 24 Jan 2022 09:21:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C49E43858425 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-9505] dwarf2out: Fix -gsplit-dwarf on riscv [PR103874] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: baf18a6d47c4325be004cb6289d4057b113de282 X-Git-Newrev: 3991e4c752b3450decdb36e0b562e044ce653b3d Message-Id: <20220124092143.C49E43858425@sourceware.org> Date: Mon, 24 Jan 2022 09:21:43 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2022 09:21:43 -0000 https://gcc.gnu.org/g:3991e4c752b3450decdb36e0b562e044ce653b3d commit r11-9505-g3991e4c752b3450decdb36e0b562e044ce653b3d Author: Jakub Jelinek Date: Thu Jan 20 11:58:20 2022 +0100 dwarf2out: Fix -gsplit-dwarf on riscv [PR103874] riscv*-*-* are the only modern targets that !HAVE_AS_LEB128 (apparently due to some aggressive linker optimizations). As the following testcase shows, we mishandle in index_rnglists the !HAVE_AS_LEB128 && !have_multiple_function_sections case. output_rnglists does roughly: FOR_EACH_VEC_SAFE_ELT (ranges_table, i, r) { ... if (block_num > 0) { ... if (HAVE_AS_LEB128) { if (!have_multiple_function_sections) { // code not using r->*_entry continue; } // code that sometimes doesn't use r->*_entry, // sometimes r->begin_entry } else if (dwarf_split_debug_info) { // code that uses both r->begin_entry and r->end_entry } else { // code not using r->*_entry } } else if (block_num < 0) { if (!have_multiple_function_sections) gcc_unreachable (); ... } } and index_rnglists is what sets up those r->{begin,end}_entry members. The code did an early if (!have_multiple_function_sections) continue; which is fine for the HAVE_AS_LEB128 case, because r->*_entry is not used in that case, but not for !HAVE_AS_LEB128 that uses it anyway. 2022-01-20 Jakub Jelinek PR debug/103874 * dwarf2out.c (index_rnglists): For !HAVE_AS_LEB128 and block_num > 0, index entry even if !have_multiple_function_sections. * gcc.dg/debug/dwarf2/pr103874.c: New test. (cherry picked from commit 68f03ac49cb4f585dbce78dc9e4c4a9ec950e83c) Diff: --- gcc/dwarf2out.c | 5 +++-- gcc/testsuite/gcc.dg/debug/dwarf2/pr103874.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index d74c8e3867f..e5d3ce4966d 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -11961,9 +11961,10 @@ index_rnglists (void) if (r->label && r->idx != DW_RANGES_IDX_SKELETON) r->idx = rnglist_idx++; - if (!have_multiple_function_sections) - continue; int block_num = r->num; + if ((HAVE_AS_LEB128 || block_num < 0) + && !have_multiple_function_sections) + continue; if (HAVE_AS_LEB128 && (r->label || r->maybe_new_sec)) base = false; if (block_num > 0) diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr103874.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr103874.c new file mode 100644 index 00000000000..2f0e2d44e42 --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr103874.c @@ -0,0 +1,12 @@ +/* PR debug/103874 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -g -gsplit-dwarf -dA -Wno-implicit-function-declaration" } */ + +void +foo (void) +{ + { + bar (); + baz (); + } +}