From patchwork Thu Apr 4 15:18:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 88034 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E38223858431 for ; Thu, 4 Apr 2024 15:19:13 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id BD8943858410 for ; Thu, 4 Apr 2024 15:18:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BD8943858410 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BD8943858410 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712243907; cv=none; b=xahi4bb9JwhE06D0riuhgX6i5971REe19x7HhX8wJMKrvhiOcFM9vxNxVYgjywCJ+PplukTD/4OUWxkBS73Y2KCgHE8bjl5XvgDPyLadjL6N+ial8XA3c57J3M0Zio2BS4BGR5K4UAn0+isiHrGJPnrC9wVqYdIUKeZcMnIAX1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712243907; c=relaxed/simple; bh=BvSuPx7i88vd9mbne1RJHps1gbwKZFRCc9SqI7ubLDM=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=X8lFujp3hWxnocfg+pBOmsW8g3Api2z7KE0bLx6ZVrdy8ERWtpz8dKb9AiwJ7pTpxjB5RBPOLK8CUcRWSBXmJQgT6UKkmDPSA4YHu0UujaJsCxaReuSGOlG7s7R4gAaz/38qZrZRH7iHRSYV1TjruiYby2/MZFRb10jrrGgPug8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id AC4CE5F85A for ; Thu, 4 Apr 2024 15:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712243903; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tBIArk6UNXgytSqddSOQasMoKT/8CpEPlsOrJa0K300=; b=iQlvoGqr8sFQ3nLlBJJqAlbkzoTv8KtATzU2WiuAQlZHuqe47o3V9cJDecQ/eML9lJIrqo tHoroUujl23qj2/nYirBc0T4tL0ZQlb3ZzF+RLHtBsX7Bc02/AsI9/GBRIFaP9Oj74zhYy TE91n08/dCq3TRbbWGUVQHzoc5LijR8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712243903; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tBIArk6UNXgytSqddSOQasMoKT/8CpEPlsOrJa0K300=; b=Kar3obopML4hqiuEZtXUa1PJNTdYJH3UdP/CplRWG6nucsyRYKGLn+/ud3pqIQXF0ZTpwB n3SCyaSQ8t8pziCQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=iQlvoGqr; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Kar3obop DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712243903; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tBIArk6UNXgytSqddSOQasMoKT/8CpEPlsOrJa0K300=; b=iQlvoGqr8sFQ3nLlBJJqAlbkzoTv8KtATzU2WiuAQlZHuqe47o3V9cJDecQ/eML9lJIrqo tHoroUujl23qj2/nYirBc0T4tL0ZQlb3ZzF+RLHtBsX7Bc02/AsI9/GBRIFaP9Oj74zhYy TE91n08/dCq3TRbbWGUVQHzoc5LijR8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712243903; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tBIArk6UNXgytSqddSOQasMoKT/8CpEPlsOrJa0K300=; b=Kar3obopML4hqiuEZtXUa1PJNTdYJH3UdP/CplRWG6nucsyRYKGLn+/ud3pqIQXF0ZTpwB n3SCyaSQ8t8pziCQ== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 979B0139E8 for ; Thu, 4 Apr 2024 15:18:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap2.dmz-prg2.suse.org with ESMTPSA id xzPII7/EDma1GQAAn2gu4w (envelope-from ) for ; Thu, 04 Apr 2024 15:18:23 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/3] [gdb/testsuite] Require address update for DW_LNE_end_sequence Date: Thu, 4 Apr 2024 17:18:25 +0200 Message-Id: <20240404151827.18126-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: -4.01 X-Rspamd-Action: no action X-Rspamd-Queue-Id: AC4CE5F85A X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; DWL_DNSWL_LOW(-1.00)[suse.de:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:98:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[sourceware.org:url, imap2.dmz-prg2.suse.org:helo, imap2.dmz-prg2.suse.org:rdns, suse.de:dkim] X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org With test-case gdb.dwarf2/dw2-epilogue-begin.exp, we have an end_sequence entry with the same address as the line entry before it: ... File name Line number Starting address View Stmt dw2-epilogue-begin.c 44 0x4101e8 x dw2-epilogue-begin.c 47 0x4101ec x dw2-epilogue-begin.c - 0x4101ec ... and consequently the line entry is removed by gdb: ... INDEX LINE REL-ADDRESS UNREL-ADDRESS IS-STMT PRO EPI 0 20 0x00000000004101a8 0x00000000004101a8 Y Y Y 1 27 0x00000000004101b0 0x00000000004101b0 Y 2 32 0x00000000004101b8 0x00000000004101b8 Y Y 3 34 0x00000000004101c0 0x00000000004101c0 Y Y 4 35 0x00000000004101c8 0x00000000004101c8 Y 5 40 0x00000000004101d4 0x00000000004101d4 Y Y 6 44 0x00000000004101e8 0x00000000004101e8 Y 7 END 0x00000000004101ec 0x00000000004101ec Y ... This is a common mistake in dwarf assembly test-cases. Fix this by: - requiring an address update for each DW_LNE_end_sequence, and - fixing the test-cases where that triggers an error. I also encountered the error in test-case gdb.dwarf2/dw2-bad-elf.exp, and in this case I worked around it using "DW_LNS_advance_pc 0". Tested on aarch64-linux. PR testsuite/31592 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31592 --- gdb/testsuite/gdb.base/until-trailing-insns.exp | 3 +-- gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp | 6 ++++++ .../gdb.dwarf2/dw2-disasm-over-non-stmt.exp | 1 - gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp | 1 + .../gdb.dwarf2/dw2-inline-small-func.exp | 2 ++ gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp | 1 + gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp | 6 ------ gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp | 15 +++++---------- gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp | 4 ---- .../gdb.dwarf2/locexpr-data-member-location.exp | 7 +++---- gdb/testsuite/lib/dwarf.exp | 13 +++++++++++++ 11 files changed, 32 insertions(+), 27 deletions(-) base-commit: f9c9ef44f00238c79d586b385daa14d46a76733a diff --git a/gdb/testsuite/gdb.base/until-trailing-insns.exp b/gdb/testsuite/gdb.base/until-trailing-insns.exp index aed36814809..baa5f1fa32c 100644 --- a/gdb/testsuite/gdb.base/until-trailing-insns.exp +++ b/gdb/testsuite/gdb.base/until-trailing-insns.exp @@ -147,9 +147,8 @@ Dwarf::assemble $asm_file { line [gdb_get_line_number "TAG: main return"] DW_LNS_negate_stmt DW_LNS_copy + DW_LNE_set_address $main_end - line [expr [gdb_get_line_number "TAG: main return"] + 1] - DW_LNS_copy DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp index 71c5bf9014d..63d83fb9416 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp @@ -128,9 +128,12 @@ Dwarf::assemble $asm_file { DW_LNE_set_address [lindex $main_result 0] DW_LNS_advance_line 10 DW_LNS_copy + DW_LNS_advance_pc [lindex $main_result 1] DW_LNS_advance_line 19 DW_LNS_copy + + DW_LNS_advance_pc 0 DW_LNE_end_sequence } } @@ -144,9 +147,12 @@ Dwarf::assemble $asm_file { DW_LNE_set_address some_func DW_LNS_advance_line 5 DW_LNS_copy + DW_LNS_advance_pc 64 DW_LNS_advance_line 8 DW_LNS_copy + + DW_LNS_advance_pc 0 DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp b/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp index 425dd971333..aa84a20b09c 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-disasm-over-non-stmt.exp @@ -87,7 +87,6 @@ Dwarf::assemble $asm_file { DW_LNS_copy DW_LNE_set_address $main_end - DW_LNS_copy DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp index f646e23da62..7ae14fa9b5a 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp @@ -134,6 +134,7 @@ Dwarf::assemble $asm_file { DW_LNS_set_epilogue_begin DW_LNS_copy + DW_LNE_set_address "$main_start + $main_len" DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp index 1ba346b9758..b117c8910f0 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp @@ -108,6 +108,8 @@ Dwarf::assemble $asm_file { DW_LNE_set_address line_label_3 DW_LNS_copy + + DW_LNE_set_address "$main_start + $main_len" DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp b/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp index 8d85464a826..caa40861f87 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-prologue-end.exp @@ -72,6 +72,7 @@ Dwarf::assemble $asm_file { line [gdb_get_line_number "main end"] DW_LNS_copy + DW_LNE_set_address "$main_start + $main_len" DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp index 13e7c98dcf1..1a3d53c2116 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp @@ -79,24 +79,18 @@ Dwarf::assemble $asm_file { DW_LNS_advance_line 10 DW_LNS_copy DW_LNS_advance_pc [lindex $main_func 1] - DW_LNS_advance_line 19 - DW_LNS_copy DW_LNE_end_sequence DW_LNE_set_address [lindex $frame2_func 0] DW_LNS_advance_line 20 DW_LNS_copy DW_LNS_advance_pc [lindex $frame2_func 1] - DW_LNS_advance_line 29 - DW_LNS_copy DW_LNE_end_sequence DW_LNE_set_address [lindex $frame3_func 0] DW_LNS_advance_line 30 DW_LNS_copy DW_LNS_advance_pc [lindex $frame3_func 1] - DW_LNS_advance_line 39 - DW_LNS_copy DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp index ea69af44601..c952e82b335 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-func.exp @@ -133,9 +133,8 @@ proc do_test {suffix} { DW_LNE_set_address main_label2 line [gdb_get_line_number "main return"] DW_LNS_copy + DW_LNE_set_address $main_end - line [expr [gdb_get_line_number "main end"] + 1] - DW_LNS_copy DW_LNE_end_sequence DW_LNE_set_address $foo_start @@ -150,25 +149,22 @@ proc do_test {suffix} { DW_LNE_set_address foo_label3 line [gdb_get_line_number "foo end"] DW_LNS_copy + DW_LNE_set_address $foo_end - DW_LNS_advance_line 1 - DW_LNS_copy DW_LNE_end_sequence DW_LNE_set_address $bar_start line [gdb_get_line_number "bar end"] DW_LNS_copy + DW_LNS_advance_pc $bar_len - DW_LNS_advance_line 1 - DW_LNS_copy DW_LNE_end_sequence DW_LNE_set_address $baz_start line [gdb_get_line_number "baz end"] DW_LNS_copy + DW_LNS_advance_pc $baz_len - DW_LNS_advance_line 1 - DW_LNS_copy DW_LNE_end_sequence DW_LNE_set_address $foo_cold_start @@ -180,9 +176,8 @@ proc do_test {suffix} { DW_LNE_set_address foo_cold_label2 line [gdb_get_line_number "foo_cold end"] DW_LNS_copy + DW_LNE_set_address $foo_cold_end - DW_LNS_advance_line 1 - DW_LNS_copy DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp b/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp index d2ea91e2d3d..567049adc87 100644 --- a/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp +++ b/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp @@ -93,8 +93,6 @@ Dwarf::assemble $asm_file_1 { DW_LNS_copy DW_LNE_set_address $func_end - DW_LNS_advance_line 1 - DW_LNS_copy DW_LNE_end_sequence } } @@ -177,8 +175,6 @@ Dwarf::assemble $asm_file_2 { DW_LNS_copy DW_LNE_set_address $main_end - DW_LNS_advance_line 2 - DW_LNS_copy DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp index ca597aaaa3e..a1c0e7705b3 100644 --- a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp +++ b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp @@ -283,11 +283,11 @@ Dwarf::assemble ${asm_file} { DW_LNS_copy line [gdb_get_line_number "foo end" $libsrc] DW_LNS_copy + DW_LNE_set_address $foo_end - DW_LNS_advance_line 1 - DW_LNS_copy DW_LNE_end_sequence + DW_LNE_set_address $bar_start line [gdb_get_line_number "bar prologue" $libsrc] DW_LNS_copy @@ -296,9 +296,8 @@ Dwarf::assemble ${asm_file} { DW_LNS_copy line [gdb_get_line_number "bar end" $libsrc] DW_LNS_copy + DW_LNE_set_address $bar_end - DW_LNS_advance_line 1 - DW_LNS_copy DW_LNE_end_sequence } } diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index d085f835f07..816440f975f 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -2545,13 +2545,17 @@ namespace eval Dwarf { proc program { body } { variable _line_header_end_label variable _line + variable _line_address_update set _line 1 + set _line_address_update 0 _line_finalize_header proc DW_LNE_set_address {addr} { + variable _line_address_update + set _line_address_update 1 _op .byte 0 set start [new_label "set_address_start"] set end [new_label "set_address_end"] @@ -2567,6 +2571,11 @@ namespace eval Dwarf { } proc DW_LNE_end_sequence {} { + variable _line_address_update + if { $_line_address_update == 0 } { + error "Missing address update for end_sequence" + } + set _line_address_update 0 variable _line _op .byte 0 _op .uleb128 1 @@ -2591,6 +2600,8 @@ namespace eval Dwarf { } proc DW_LNS_copy {} { + variable _line_address_update + set _line_address_update 0 _op .byte 1 } @@ -2607,6 +2618,8 @@ namespace eval Dwarf { } proc DW_LNS_advance_pc {offset} { + variable _line_address_update + set _line_address_update 1 _op .byte 2 _op .uleb128 ${offset} }