From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id +X5vAGZOjGqWVTwAWB0awg (envelope-from ) for ; Mon, 24 Aug 2026 10:00:06 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=b2Evcgso; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ZBonNIT5; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=p+It5usS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=KF7NPQDG; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id EEE261E0A3; Mon, 24 Aug 2026 10:00:05 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id ACCCE1E033 for ; Mon, 24 Aug 2026 10:00:04 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 92E084BA79B4 for ; Mon, 24 Aug 2026 14:00:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 92E084BA79B4 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=b2Evcgso; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ZBonNIT5; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=p+It5usS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=KF7NPQDG Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 5DC1D4BA23EE for ; Mon, 24 Aug 2026 13:59:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5DC1D4BA23EE 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 5DC1D4BA23EE Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579945; cv=none; b=eHDPjtH64id0WOSqUf4bfvF9u5yY435wLSz/dZX82cD1tDEeH6y34dgKVyZulNHotCOKVFq8LHtvLAMQdQWCky4oHP3DGbYO37thGbPTcZN2MNZ6iv3ImVnhuZmHAfHYp2CHfSATu+nmKTgqgSRb91+8Lemuy6K+D1tZ6dozFcU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579945; c=relaxed/simple; bh=VX7UtvcCOkbWeMbZTNJ5wPVpGYEAW4w4t8+rXC6cduc=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=dbsAcyy1sxZuadGiPgkgsGhLbjFDmTEWcdLGbfvQ1S81M3sQmFZAFKXbpqPjrUelYfyiQYHibFiVQfaGamStMHoCdxIiQNyNmC40MLehNHpit+QHSkfUomDEi0tKRnWggsfs/a9ESWXO75qETWRKt0EVZ6tyN3pBriP2N1KaxMA= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=b2Evcgso; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ZBonNIT5; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=p+It5usS; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=KF7NPQDG DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5DC1D4BA23EE 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 1A8A186930 for ; Mon, 24 Aug 2026 13:58:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787579940; 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=jl+H2V96ceYfgyvqjpjPQz0e6f1l7zJdlyoDTYBuwmY=; b=b2EvcgsohT1eqcS5pVAZyJnOVFwrvEgDEzGPttYt8tA18h3LgBu8+Wz+XXET1CMkUjUYdS SszAoJJLzOlOAovLGpmRCP3T5yyZNgfoPI0z9mO4mnZ0QslMpabMLsKPGVxMsp3A/cNJvf rDoUD2HGWh8WjW/5szS9fj6FhHGXF/g= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787579940; 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=jl+H2V96ceYfgyvqjpjPQz0e6f1l7zJdlyoDTYBuwmY=; b=ZBonNIT5me3MjHwGaObpGrOjWWc8zTe27XLG9X/MGp8zWZq24C9d+KZZKLClCOoC5yaSJl UhI/SSZj5j/PGNDQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=p+It5usS; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=KF7NPQDG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787579936; 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=jl+H2V96ceYfgyvqjpjPQz0e6f1l7zJdlyoDTYBuwmY=; b=p+It5usSSUb1BkBliMxvhb4TfCfbTmWlqPiTn5pk7KFpfIHomoM3BGhsOwMGA2RtG+9ZYu ypj+ndAupWIumB7Ij58OroWGDLdma2NcPE2jjR6c3J5VIW1x3g4S5BqUgOi+8dhAfm39ak MN5HIIhiFx+eZwGr5X0cDDw+AcDogRQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787579936; 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=jl+H2V96ceYfgyvqjpjPQz0e6f1l7zJdlyoDTYBuwmY=; b=KF7NPQDGNiwoNTPVl/yirhpy6rQOE18QN3c3foGyAKbMWXh4YedIKucGpFkt5ilcAWG3QN uJx/msfP+TNDbKDQ== 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 081DE133A6 for ; Mon, 24 Aug 2026 13:58:56 +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 aECnACBOjGo+eQAAD6G6ig (envelope-from ) for ; Mon, 24 Aug 2026 13:58:56 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 02/11] [gdb/testsuite] Fix return -level 2 bug in with_test_prefix Date: Mon, 24 Aug 2026 15:58:46 +0200 Message-ID: <20260824135855.1195963-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260824135855.1195963-1-tdevries@suse.de> References: <20260824135855.1195963-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Queue-Id: 1A8A186930 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)[]; FROM_HAS_DN(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[gnu.org:url, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns, suse.de:mid, suse.de:dkim] X-Rspamd-Server: rspamd1.dmz-prg2.suse.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~public-inbox=simark.ca@sourceware.org Consider proc with_test_prefix: ... proc with_test_prefix { prefix body } { global pf_prefix set saved $pf_prefix append pf_prefix " " $prefix ":" set code [catch {uplevel 1 $body} result] set pf_prefix $saved if {$code == 1} { global errorInfo errorCode return -code $code -errorinfo $errorInfo -errorcode $errorCode $result } else { return -code $code $result } } ... I asked Claude Code: ... The function test_with_prefix is trying to implement that "test_with_prefix prefix body" has the same semantics as "body" (ignoring the prefix part). Can you verify this, and possibly come up with a counter-example? ... and it came up with using return -level 2. I wrote a standalone reproducer: ... proc with_test_prefix { body } { set code [catch {uplevel 1 $body} result] if {$code == 1} { global errorInfo errorCode return -code $code -errorinfo $errorInfo -errorcode $errorCode $result } else { return -code $code $result } } proc bar {} { with_test_prefix { puts "Returning in bar (ok)" return -level 2 1 } } proc foo {} { set res [bar] puts "returning in foo (not ok)" return 2 } puts [foo] ... which gives us: ... $ tclsh ./test.tcl Returning in bar (ok) returning in foo (not ok) 2 ... Fix this by: - using "catch {...} result opts" to capture the return options dictionary - increasing -level in $opts, and - using return -options $opts, reducing exception handling to just two lines: ... catch {uplevel 1 $body} result opts ... return -options [dict incr opts -level 1] $result ... The problem exists everywhere were we use the same catch/return pattern, but that gets fixed in following patches. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34553 --- .../gdb.testsuite/with-test-prefix.exp | 45 +++++++++++++++++++ gdb/testsuite/lib/gdb.exp | 9 +--- 2 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 gdb/testsuite/gdb.testsuite/with-test-prefix.exp diff --git a/gdb/testsuite/gdb.testsuite/with-test-prefix.exp b/gdb/testsuite/gdb.testsuite/with-test-prefix.exp new file mode 100644 index 00000000000..366be7ee3e6 --- /dev/null +++ b/gdb/testsuite/gdb.testsuite/with-test-prefix.exp @@ -0,0 +1,45 @@ +# Copyright 2026 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Testsuite self-tests for with_test_prefix. + +proc bar {variant} { + if {$variant == 0} { + verbose -log "Returning in bar (ok)" + return -level 2 1 + } else { + with_test_prefix dummy { + verbose -log "Returning in bar (ok)" + return -level 2 1 + } + } +} + +proc foo {variant} { + set res [bar $variant] + verbose -log "returning in foo (not ok)" + return 2 +} + +# Note: don't use with_test_prefix (directly or indirectly) to make sure that +# this test is run even if with_test_prefix is broken. +foreach variant {0 1} { + set msg "$variant: return -level 2" + try { + set res 0 + set res [foo $variant] + } finally { + gdb_assert {$res == 1} $msg + } +} diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 09c89624f2e..71e38e4801a 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3294,15 +3294,10 @@ proc with_test_prefix { prefix body } { set saved $pf_prefix append pf_prefix " " $prefix ":" - set code [catch {uplevel 1 $body} result] + catch {uplevel 1 $body} result opts set pf_prefix $saved - if {$code == 1} { - global errorInfo errorCode - return -code $code -errorinfo $errorInfo -errorcode $errorCode $result - } else { - return -code $code $result - } + return -options [dict incr opts -level 1] $result } # Wrapper for foreach that calls with_test_prefix on each iteration, -- 2.51.0