From patchwork Mon Apr 8 12:04:42 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: 88170 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 9037C3858D39 for ; Mon, 8 Apr 2024 12:05:47 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 72D993858C32 for ; Mon, 8 Apr 2024 12:04:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 72D993858C32 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 72D993858C32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712577875; cv=none; b=t6L2ABE3bg2WWxik7rqE8uT6eqRndOep6DlXXFPxWGWZ+cDOV2xF/42XjYsOvrY4HVaHhRiVxNNLWopdtonMaLrJv6Xj3KJl3BhoSvLdKISG8g7xnjBeJxyq8WP330fiEvy9ImA9AcA1qG7h+k98QxyGl6vtRUD2NYIhVfWMt/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712577875; c=relaxed/simple; bh=1FXotFTjZ+PvMjp3P8dLmmz7RN+FdX7FS8ee0zNlNKw=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=WV5x3eE+sU4G6WHrXjO5vMfDiFiBM3U0MN0D7f8OATHjPTndAdAIPH9xE7zBuGu1zRimh1y9SYEhddFbIPdTMiGOPYMlV4gieW9zPcWm2QBZhcPbKqCFGQdgIRqB35AD8Ym7ErUwp3i5cHrZZeNcYsnBXm86GjxxAJ7BPdTbous= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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-out1.suse.de (Postfix) with ESMTPS id E326122858 for ; Mon, 8 Apr 2024 12:04:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712577872; 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=UEj0TVxfVeNiVn+ePZ/v2qF6iv0s+YWYrZDiDpOipqc=; b=1Q1t1e+4egJO5/pc9an0LnwEv/UcZiix2Wz6GtSYbKVQDjonTdn1GzCtWmrTeVNP9lcTsv 9odl3U/24Op14pfiGbkmWeeFFZ+gBly0O0aVAJMW+Te7RDKvSooPtqQeXVjsIVrnk+GvaF o4gUwLmOlunKQ24taJfOh0j/g3/Ym98= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712577872; 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=UEj0TVxfVeNiVn+ePZ/v2qF6iv0s+YWYrZDiDpOipqc=; b=AVS90u7HLDavusuVvH6uy8vdit9jqppaSqZoWedjXEKxuo4yGVoqtnK91Zv3p3D30lMNZx V58JSPvHQCh2XKAw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=UanmwLyu; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=PAulRHJ6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712577871; 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=UEj0TVxfVeNiVn+ePZ/v2qF6iv0s+YWYrZDiDpOipqc=; b=UanmwLyuxvmSIAPVB7f0tL/50HlcrBH1b0EAugyJaYPHRlTwpUKCOwHBPod84qujWYBjQd xluo4xYNsNp6ULgn5cX6itmjRx0ZFWEs8YRCQ2gt3rwhvz76hBtzbLTePn1U7kiCMIWnCc VOCSm+JtzNCI9To5sxf5/vvfPjYH9yg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712577871; 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=UEj0TVxfVeNiVn+ePZ/v2qF6iv0s+YWYrZDiDpOipqc=; b=PAulRHJ6kGc5XVAOERCUFYorfaxoFKiE/5h+/SiIq5LzrpvDOcy4xdoDQvdB9B4AJAK4n5 a62crB/lcdpYlSAA== Received: from imap1.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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C6F02137D4 for ; Mon, 8 Apr 2024 12:04:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id fd24Lk/dE2a6IQAAD6G6ig (envelope-from ) for ; Mon, 08 Apr 2024 12:04:31 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 1/4] [gdb/testsuite] Require address update for DW_LNE_end_sequence Date: Mon, 8 Apr 2024 14:04:42 +0200 Message-Id: <20240408120445.12544-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; 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)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Queue-Id: E326122858 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -3.01 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: 94a94c904da29bb733c19b5a0a168557c1819720 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} } From patchwork Mon Apr 8 12:04:43 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: 88168 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 1023F38460BD for ; Mon, 8 Apr 2024 12:05:12 +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 17ECC3858D20 for ; Mon, 8 Apr 2024 12:04:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 17ECC3858D20 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 17ECC3858D20 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=1712577875; cv=none; b=qMWTAyYV06qd//SYr8JNa70IeA3um2w9PYGEY35swkU6Vp8MB0VaRjwwX3LXXfX99xAa/OD5hmdF/TQdc/7x7jr8Tmi3JnZFtpQhh6lvtNDgVJFWM2/5Az96os/qq+WqNJKOM5uWU9QXfS7GJaZ6U2O86/fA9gXe2DhDkvLwM9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712577875; c=relaxed/simple; bh=1inVw355B3VQ+rWL2VwptxvqcwyBHFGvXpVM5aT+8lM=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=EyPy5snNwz48ZBKiiTEDOviD/WlEw31x8F6WGzFL/nGMZq0Knj6ZImXg2635bxEv28rME+uGx57FTyke1h6yLJ8r5WkP36MJukTbgZz62cIqvr9EC6I38SPG4Iwo7xtTQkZk0e5ruMzV4wmQgCKbVUNBVt9kh6Oj08wnlgf1Sbo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (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 0A06820315 for ; Mon, 8 Apr 2024 12:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZV5VTN9LvL3TBZQXac4ldzJ5U2bYzOvr46o2AvW3B4Q=; b=J2JjIgOtUApy2p9EUoCxDxt8cyqPOdBhYeASxrw5AdfMNQ78xFiZWgtPVeozS//POOP3ML 7CDWhCzTeuUrEFFZ67WsC1NdhcnktXEh2WhvaO+oWxYh5n4ydh79ZQ0uV8VlpYUniP1+7Z M1VGjbmsInCoolg+TWAf0fkGaZ4u54o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZV5VTN9LvL3TBZQXac4ldzJ5U2bYzOvr46o2AvW3B4Q=; b=f+T6JPWE3awyoSt4A+Pc6ufA3lR03Jyr//9sCFvTwXB08EKWBmPc44PV6fJSG/+IXEwN9I wLASFxsYTt3WaADg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZV5VTN9LvL3TBZQXac4ldzJ5U2bYzOvr46o2AvW3B4Q=; b=J2JjIgOtUApy2p9EUoCxDxt8cyqPOdBhYeASxrw5AdfMNQ78xFiZWgtPVeozS//POOP3ML 7CDWhCzTeuUrEFFZ67WsC1NdhcnktXEh2WhvaO+oWxYh5n4ydh79ZQ0uV8VlpYUniP1+7Z M1VGjbmsInCoolg+TWAf0fkGaZ4u54o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZV5VTN9LvL3TBZQXac4ldzJ5U2bYzOvr46o2AvW3B4Q=; b=f+T6JPWE3awyoSt4A+Pc6ufA3lR03Jyr//9sCFvTwXB08EKWBmPc44PV6fJSG/+IXEwN9I wLASFxsYTt3WaADg== Received: from imap1.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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E55BD1386D for ; Mon, 8 Apr 2024 12:04:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id sEKuNk/dE2a6IQAAD6G6ig (envelope-from ) for ; Mon, 08 Apr 2024 12:04:31 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 2/4] [gdb/testsuite] Require address update for DW_LNS_copy Date: Mon, 8 Apr 2024 14:04:43 +0200 Message-Id: <20240408120445.12544-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240408120445.12544-1-tdevries@suse.de> References: <20240408120445.12544-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] 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 No address update before a DW_LNS_copy might mean an incorrect dwarf assembly test-case. Try to catch such incorrect dwarf assembly test-cases by: - requiring an explicit address update for each DW_LNS_copy, and - handling the cases where an update is indeed not needed, by adding "DW_LNS_advance_pc 0". Tested on aarch64-linux. --- gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp | 1 + gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp | 1 + gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp | 1 + gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp | 3 +++ gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl | 1 + gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp | 6 ++++++ gdb/testsuite/lib/dwarf.exp | 3 +++ 7 files changed, 16 insertions(+) diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp index 5268e7815ad..6d12e968f41 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp @@ -129,6 +129,7 @@ proc do_test { start_label func_name tag } { DW_LNS_advance_line 1 DW_LNS_copy + DW_LNS_advance_pc 0 DW_LNS_advance_line -4 DW_LNS_set_file 1 DW_LNS_negate_stmt diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp index d3a1fd38ed2..6a5f7d6dd76 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp @@ -119,6 +119,7 @@ Dwarf::assemble $asm_file { DW_LNS_advance_line 1 DW_LNS_copy + DW_LNS_advance_pc 0 DW_LNS_advance_line -4 DW_LNS_set_file 1 DW_LNS_negate_stmt diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp index 66d9f645cf3..b3db154db25 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp @@ -108,6 +108,7 @@ Dwarf::assemble $asm_file { DW_LNS_advance_line 1 DW_LNS_copy + DW_LNS_advance_pc 0 DW_LNS_advance_line -4 DW_LNS_set_file 1 DW_LNS_negate_stmt diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp index b117c8910f0..ed7166983d5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-small-func.exp @@ -91,13 +91,16 @@ Dwarf::assemble $asm_file { line $f1_l1 DW_LNS_copy + DW_LNS_advance_pc 0 line ${f1_l2} DW_LNS_copy + DW_LNS_advance_pc 0 DW_LNS_set_file 2 line ${f2_l1} DW_LNS_copy + DW_LNS_advance_pc 0 DW_LNS_negate_stmt DW_LNS_copy diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl b/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl index 4f59c9b2639..968378620a0 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl @@ -96,6 +96,7 @@ Dwarf::assemble $asm_file { DW_LNS_advance_line 1 DW_LNS_copy + DW_LNS_advance_pc 0 DW_LNS_advance_line -4 DW_LNS_negate_stmt DW_LNS_copy diff --git a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp index a1c0e7705b3..2001b28989f 100644 --- a/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp +++ b/gdb/testsuite/gdb.dwarf2/locexpr-data-member-location.exp @@ -278,9 +278,12 @@ Dwarf::assemble ${asm_file} { DW_LNE_set_address $foo_start line [gdb_get_line_number "foo prologue" $libsrc] DW_LNS_copy + DW_LNE_set_address foo_label line [gdb_get_line_number "foo return" $libsrc] DW_LNS_copy + + DW_LNS_advance_pc 0 line [gdb_get_line_number "foo end" $libsrc] DW_LNS_copy @@ -291,9 +294,12 @@ Dwarf::assemble ${asm_file} { DW_LNE_set_address $bar_start line [gdb_get_line_number "bar prologue" $libsrc] DW_LNS_copy + DW_LNE_set_address bar_label line [gdb_get_line_number "bar return" $libsrc] DW_LNS_copy + + DW_LNS_advance_pc 0 line [gdb_get_line_number "bar end" $libsrc] DW_LNS_copy diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index 816440f975f..254f88f1055 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -2601,6 +2601,9 @@ namespace eval Dwarf { proc DW_LNS_copy {} { variable _line_address_update + if { $_line_address_update == 0 } { + error "Missing address update for copy" + } set _line_address_update 0 _op .byte 1 } From patchwork Mon Apr 8 12:04:44 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: 88169 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 488F4384607B for ; Mon, 8 Apr 2024 12:05:15 +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 6D7503858D39 for ; Mon, 8 Apr 2024 12:04:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6D7503858D39 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 6D7503858D39 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=1712577875; cv=none; b=lhiED7jnxORxEVfbne3U2ZHJKiSxEg050yp3YWxjNigdcLyGzfYE1QrFCuyfG8WY4oIx2zyimeDLrfaIEdnuiI5iyKZY4o5dlXjXlNogO+5rNC0lq4N342BHGt5PUtM7vkCZEGTcPduucoYotWhE7c7QcXlZNLJ9+00DFMxKgEE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712577875; c=relaxed/simple; bh=+LbFIuS4czbgCNLa1r6rL7hs3Hgp6razgq/+rQ/4ou0=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=e6ZgYln9pVJytgWz8ujrDoqI3VbxAGWOlgIsE8Ql2gdJebbgHnXCvvr0rKgwUxJ1Vc4rQyaTkh23KxGX+69nBU30rPRYrtOpkxOPcOUvp6M66QyUt9Uf7jVHMpQ/zchXlXYRE+5TgpkHnEC09LtjzLWV0HDJN1o6p6Y1+LdIJIA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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 31EC320317 for ; Mon, 8 Apr 2024 12:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ovw8Zwrr7KsI8r2UH0daK3mtsPOoR40t3zuy7bxP0vY=; b=NaQV5dM4wxMa1oXU8fNPEqKPXaGiZNRUXGm/qdjKMHQEE12m/1YNOh1STf5VnYrTBIed07 zwLaGOGsKScb4NwXYaNqs5bv2bzumzokGwvpSnORMbD6IDff0HoccILDnZIb5xZuR0f6zS TyyUR309PQQZaagHftKH+9S5Lxdta7Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ovw8Zwrr7KsI8r2UH0daK3mtsPOoR40t3zuy7bxP0vY=; b=ta3HLcMv/zGoaL1qUqCm5ncc+U7SslVxq+kw8F3v8X35ziMY+9NY8Ox+duHkdfW+uoa0Tn rCu68FGgZ/gjKCBw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=NaQV5dM4; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=ta3HLcMv DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ovw8Zwrr7KsI8r2UH0daK3mtsPOoR40t3zuy7bxP0vY=; b=NaQV5dM4wxMa1oXU8fNPEqKPXaGiZNRUXGm/qdjKMHQEE12m/1YNOh1STf5VnYrTBIed07 zwLaGOGsKScb4NwXYaNqs5bv2bzumzokGwvpSnORMbD6IDff0HoccILDnZIb5xZuR0f6zS TyyUR309PQQZaagHftKH+9S5Lxdta7Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ovw8Zwrr7KsI8r2UH0daK3mtsPOoR40t3zuy7bxP0vY=; b=ta3HLcMv/zGoaL1qUqCm5ncc+U7SslVxq+kw8F3v8X35ziMY+9NY8Ox+duHkdfW+uoa0Tn rCu68FGgZ/gjKCBw== Received: from imap1.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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0DA8A1386E for ; Mon, 8 Apr 2024 12:04:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id kJQBAlDdE2a6IQAAD6G6ig (envelope-from ) for ; Mon, 08 Apr 2024 12:04:32 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 3/4] [gdb/testsuite] Fix end_sequence addresses Date: Mon, 8 Apr 2024 14:04:44 +0200 Message-Id: <20240408120445.12544-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240408120445.12544-1-tdevries@suse.de> References: <20240408120445.12544-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Rspamd-Queue-Id: 31EC320317 X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_ONE(0.00)[1]; FROM_EQ_ENVFROM(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] 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 I noticed in test-case gdb.reverse/map-to-same-line.exp, that the end of main: ... 00000000004102c4 : 4102c4: 52800000 mov w0, #0x0 // #0 4102c8: 9100c3ff add sp, sp, #0x30 4102cc: d65f03c0 ret ... is not described by the line table: ... File name Line number Starting address View Stmt ... map-to-same-line.c 54 0x4102ac x map-to-same-line.c - 0x4102c4 ... Fix this by ending the line table at $main_end. Likewise in a few other test-cases, found using: ... $ find gdb/testsuite/ -type f \ | xargs grep -B1 DW_LNE_end_sequence \ | grep set_address \ | egrep -v "_end|_len" ... Tested on aarch64-linux. --- gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp | 7 +++++-- gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp | 4 +++- gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl | 2 +- gdb/testsuite/gdb.reverse/map-to-same-line.c | 1 - gdb/testsuite/gdb.reverse/map-to-same-line.exp | 3 ++- 10 files changed, 16 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp b/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp index 1880f4cb7fb..5d6e13a9ae0 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp @@ -70,7 +70,7 @@ Dwarf::assemble $asm_file { line [line_for bar_label] DW_LNS_copy - DW_LNE_set_address bar_label_2 + DW_LNE_set_address $bar_end DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp index 6d12e968f41..1f30c5c3316 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp @@ -146,7 +146,7 @@ proc do_test { start_label func_name tag } { DW_LNS_advance_line 1 DW_LNS_copy - DW_LNE_set_address line_label_7 + DW_LNE_set_address "$main_start + $main_len" DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp index 6a5f7d6dd76..68f1fc83859 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp @@ -134,7 +134,7 @@ Dwarf::assemble $asm_file { DW_LNS_advance_line 1 DW_LNS_copy - DW_LNE_set_address line_label_7 + DW_LNE_set_address "$main_start + $main_len" DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp index b3db154db25..1b8d136e70e 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp @@ -123,7 +123,7 @@ Dwarf::assemble $asm_file { DW_LNS_negate_stmt DW_LNS_copy - DW_LNE_set_address line_label_7 + DW_LNE_set_address "$main_start + $main_len" DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp index 603a616930a..c510de42037 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp @@ -27,6 +27,9 @@ Dwarf::assemble $asm_file { declare_labels Llines global srcdir subdir srcfile + get_func_info bar1 + get_func_info bar2 + cu {} { compile_unit { {language @DW_LANG_C} @@ -69,7 +72,7 @@ Dwarf::assemble $asm_file { line 33 DW_LNS_copy - DW_LNE_set_address bar1_label_5 + DW_LNE_set_address $bar1_end DW_LNE_end_sequence @@ -91,7 +94,7 @@ Dwarf::assemble $asm_file { line 47 DW_LNS_copy - DW_LNE_set_address bar2_label_5 + DW_LNE_set_address $bar2_end DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp index 5fd6ae04d38..85d5e9c8afb 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp @@ -104,7 +104,7 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} { line [line_for bar_label_4] DW_LNS_copy - DW_LNE_set_address bar_label_5 + DW_LNE_set_address "$main_start + $main_len" DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp index 671e3e634ac..5a0705fc613 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp @@ -30,6 +30,8 @@ Dwarf::assemble $asm_file { set DW_LNE_lo_usr 0x80 set DW_LNE_hi_usr 0xff + get_func_info main + cu {} { compile_unit { {language @DW_LANG_C} @@ -54,7 +56,7 @@ Dwarf::assemble $asm_file { DW_LNE_user 2 $DW_LNE_hi_usr DW_LNS_copy - DW_LNE_set_address main_label_2 + DW_LNE_set_address $main_end DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl b/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl index 968378620a0..5817b2b0f53 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl @@ -110,7 +110,7 @@ Dwarf::assemble $asm_file { DW_LNS_negate_stmt DW_LNS_copy - DW_LNE_set_address line_label_7 + DW_LNE_set_address "$func_start + $func_len" DW_LNE_end_sequence } } diff --git a/gdb/testsuite/gdb.reverse/map-to-same-line.c b/gdb/testsuite/gdb.reverse/map-to-same-line.c index 45e7ffb0f06..7185955f40a 100644 --- a/gdb/testsuite/gdb.reverse/map-to-same-line.c +++ b/gdb/testsuite/gdb.reverse/map-to-same-line.c @@ -53,6 +53,5 @@ main (void) asm ("main_return: .globl main_return"); k = j; f3 = f2; str_3 = str_2; /* TAG: main return */ - asm ("end_of_sequence: .globl end_of_sequence"); return 0; /* TAG: main return */ } diff --git a/gdb/testsuite/gdb.reverse/map-to-same-line.exp b/gdb/testsuite/gdb.reverse/map-to-same-line.exp index b556e7cb676..067fe012702 100644 --- a/gdb/testsuite/gdb.reverse/map-to-same-line.exp +++ b/gdb/testsuite/gdb.reverse/map-to-same-line.exp @@ -100,7 +100,8 @@ Dwarf::assemble $asm_file { DW_LNE_set_address main_return line [gdb_get_line_number "TAG: main return"] DW_LNS_copy - DW_LNE_set_address end_of_sequence + + DW_LNE_set_address $main_end DW_LNE_end_sequence } } From patchwork Mon Apr 8 12:04:45 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: 88167 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 DEB5B384640D for ; Mon, 8 Apr 2024 12:05:11 +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 383083858D32 for ; Mon, 8 Apr 2024 12:04:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 383083858D32 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 383083858D32 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=1712577875; cv=none; b=gdWPa7UB21wk7NdPLP/ElZS4vMgQkoyBoV5ftM3LbpBwKAX1YivEJ2XAdhOO6jNyDiNkwGOR5iu+0w/r34kFEP/HKPL7KzSdfwKTcd+fJHOkEFJw9VcYGf3uH8hdICn/u3VuY1DrTgiXdYASLAgbCKTw+HY1W275luaJjinbik8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712577875; c=relaxed/simple; bh=lgZr1tQzqD/r7PtA/Xlfdz0Ytqx/+lLiKB+aXKJp5j4=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=SpfF/NsRBaebvT/ixbVg8m2cJl9bXf2mab/IjqiYMd2vFYQ84CaLV5EuSwckhcDtPt4yv8dNkLTJeJKFKUnd9RzHS2epJ9mE3E+FqE1hMq4T1YVsrz51SGECyLQti0giM3YUqPbkdYWFKWcOb5NC6IA93gw0bTWdanQ01Gi+uYQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (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 4211B20318 for ; Mon, 8 Apr 2024 12:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8N5yqEK0xproqTteANMkZcfSdoYwkMf5PLIz+2+0HwI=; b=nj4/8B1XJuJ5ikUC7iGk2nmNFdEJaMAXKtMREj8RVsXgxGJzWltHqxBcBzqtABJRveX3xS selGCzyZHppN2csv58+6kJR2ilUnCKd8275S3guxUzT6yTc5Up7IAwTFPDsFhlZT+Vm7AN Tevzrf1c4E+3yknri27CJENzHkRLvAE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8N5yqEK0xproqTteANMkZcfSdoYwkMf5PLIz+2+0HwI=; b=qwt3byvm0kFtOlR1lDEqYBl1YKJL9jOIS4nVYECCKO3fBdro1tbamZJPZctRGru60400I8 TBaUjN7X8RIf79DA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8N5yqEK0xproqTteANMkZcfSdoYwkMf5PLIz+2+0HwI=; b=nj4/8B1XJuJ5ikUC7iGk2nmNFdEJaMAXKtMREj8RVsXgxGJzWltHqxBcBzqtABJRveX3xS selGCzyZHppN2csv58+6kJR2ilUnCKd8275S3guxUzT6yTc5Up7IAwTFPDsFhlZT+Vm7AN Tevzrf1c4E+3yknri27CJENzHkRLvAE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712577872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8N5yqEK0xproqTteANMkZcfSdoYwkMf5PLIz+2+0HwI=; b=qwt3byvm0kFtOlR1lDEqYBl1YKJL9jOIS4nVYECCKO3fBdro1tbamZJPZctRGru60400I8 TBaUjN7X8RIf79DA== Received: from imap1.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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 2B4A81386D for ; Mon, 8 Apr 2024 12:04:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 8DkiCVDdE2a6IQAAD6G6ig (envelope-from ) for ; Mon, 08 Apr 2024 12:04:32 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 4/4] [gdb/testsuite] Require DW_LNE_end_sequence Date: Mon, 8 Apr 2024 14:04:45 +0200 Message-Id: <20240408120445.12544-4-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240408120445.12544-1-tdevries@suse.de> References: <20240408120445.12544-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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 The dwarf standard requires that every line number program sequence ends with a DW_LNE_end_sequence instruction. Enforce this in the dwarf assembler for the last sequence in a line number program (we have no means to enforce this for earlier sequences), and fix a few test-case that don't have it. Tested on aarch64-linux. PR testsuite/31618 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31618 --- gdb/testsuite/gdb.dwarf2/dw2-noloc.exp | 3 +++ .../gdb.dwarf2/dw2-symtab-includes-lookup.exp | 7 +++++ .../gdb.dwarf2/dw2-symtab-includes.exp | 7 +++++ gdb/testsuite/lib/dwarf.exp | 26 +++++++++++++++++++ 4 files changed, 43 insertions(+) diff --git a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp index 8c96ab8b0c5..bd74760e29c 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp @@ -203,6 +203,9 @@ Dwarf::assemble $asm_file { line [gdb_get_line_number "main start"] DW_LNS_set_prologue_end DW_LNS_copy + + DW_LNE_set_address $main_end + DW_LNE_end_sequence } } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp index 14bc84882be..96a528498da 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp @@ -50,6 +50,8 @@ Dwarf::assemble $asm_file { declare_labels partial_label lines_label global srcdir subdir srcfile + get_func_info main + cu {} { partial_label: partial_unit { {stmt_list ${lines_label} DW_FORM_sec_offset} @@ -77,7 +79,12 @@ Dwarf::assemble $asm_file { include_dir "${srcdir}/${subdir}" file_name "dw2-symtab-includes.h" 1 program { + DW_LNE_set_address $main_start DW_LNS_advance_line 1 + DW_LNS_copy + + DW_LNE_set_address $main_end + DW_LNE_end_sequence } } } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp index 09007f22200..dc4a788bd70 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp @@ -29,6 +29,8 @@ Dwarf::assemble $asm_file { declare_labels partial_label lines_label global srcdir subdir srcfile + get_func_info main + cu {} { partial_label: partial_unit {} { } @@ -49,7 +51,12 @@ Dwarf::assemble $asm_file { include_dir "${srcdir}/${subdir}" file_name "dw2-symtab-includes.h" 1 program { + DW_LNE_set_address $main_start DW_LNS_advance_line 1 + DW_LNS_copy + + DW_LNE_set_address $main_end + DW_LNE_end_sequence } } } diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index 254f88f1055..c694375b534 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -2546,16 +2546,20 @@ namespace eval Dwarf { variable _line_header_end_label variable _line variable _line_address_update + variable _line_program_terminated set _line 1 set _line_address_update 0 + set _line_program_terminated 0 _line_finalize_header proc DW_LNE_set_address {addr} { variable _line_address_update set _line_address_update 1 + variable _line_program_terminated + set _line_program_terminated 0 _op .byte 0 set start [new_label "set_address_start"] set end [new_label "set_address_end"] @@ -2576,6 +2580,8 @@ namespace eval Dwarf { error "Missing address update for end_sequence" } set _line_address_update 0 + variable _line_program_terminated + set _line_program_terminated 1 variable _line _op .byte 0 _op .uleb128 1 @@ -2584,6 +2590,8 @@ namespace eval Dwarf { } proc DW_LNE_user { len opcode } { + variable _line_program_terminated + set _line_program_terminated 0 set DW_LNE_lo_usr 0x80 set DW_LNE_hi_usr 0xff if { $DW_LNE_lo_usr <= $opcode @@ -2605,22 +2613,32 @@ namespace eval Dwarf { error "Missing address update for copy" } set _line_address_update 0 + variable _line_program_terminated + set _line_program_terminated 0 _op .byte 1 } proc DW_LNS_negate_stmt {} { + variable _line_program_terminated + set _line_program_terminated 0 _op .byte 6 } proc DW_LNS_set_prologue_end {} { + variable _line_program_terminated + set _line_program_terminated 0 _op .byte 0x0a } proc DW_LNS_set_epilogue_begin {} { + variable _line_program_terminated + set _line_program_terminated 0 _op .byte 0x0b } proc DW_LNS_advance_pc {offset} { + variable _line_program_terminated + set _line_program_terminated 0 variable _line_address_update set _line_address_update 1 _op .byte 2 @@ -2628,6 +2646,8 @@ namespace eval Dwarf { } proc DW_LNS_advance_line {offset} { + variable _line_program_terminated + set _line_program_terminated 0 variable _line _op .byte 3 _op .sleb128 ${offset} @@ -2650,11 +2670,17 @@ namespace eval Dwarf { } proc DW_LNS_set_file {num} { + variable _line_program_terminated + set _line_program_terminated 0 _op .byte 4 _op .sleb128 ${num} } uplevel $body + + if { $_line_program_terminated == 0 } { + error "Missing end_seq" + } } uplevel $body