From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OQBdOK5OjGqWVTwAWB0awg (envelope-from ) for ; Mon, 24 Aug 2026 10:01:18 -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=UKYQxVX0; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=q6/FM78V; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ga3PBcRu; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YGSdV9RV; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id E04AC1E0A3; Mon, 24 Aug 2026 10:01:18 -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 [38.145.34.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 1FF901E033 for ; Mon, 24 Aug 2026 10:01:18 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D33224BA901D for ; Mon, 24 Aug 2026 14:01:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D33224BA901D 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=UKYQxVX0; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=q6/FM78V; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ga3PBcRu; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YGSdV9RV Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 516644BA9031 for ; Mon, 24 Aug 2026 13:59:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 516644BA9031 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 516644BA9031 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=1787579949; cv=none; b=Os6cYP0EGWzMZ0RKv0Hnb3mrMFJ81etY9oH7ZvhHC1PiwM1QB/DM6dldWMjM7qcqe6swBw1U+ry37S32oL3h8b4q9hO/i5XFhMISAOz7zdZ5+4+sHPFh+S7zJ54nS6tiggWWMr/kAt4NMgQqOFU+oQgeO131HVPbCR1MM3R6bV0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579949; c=relaxed/simple; bh=R8xb8kCaQeND3AhMw3E9e7Q8PamzbDwXTYTpJP0EUpM=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=GyhRtY4p8ekKmFD0RRjnYal5AkwHC4vIoJr2X5izqg479fKCrjqBZVLr/n0Cv8hL9DDLo6lyIpHNTHFRRi4spjFH0wSvuG08NScbwI76Q1FJGIe4B/q0gXrWPaoPJgvm4AN2LrNZsRRfWr1fh6oJ1r7LBDRjHXiVfqrrQR/tC+8= 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=UKYQxVX0; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=q6/FM78V; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ga3PBcRu; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YGSdV9RV DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 516644BA9031 Received: from imap1.dmz-prg2.suse.org (unknown [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 208538695D for ; Mon, 24 Aug 2026 13:59:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787579944; 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=9l9hvkL5bSOqG1a/5X2h3Db+hMC+3FRLlC4KgN2hoZ4=; b=UKYQxVX0zonrQPlNfer6bNL0DypkYsNAIr2sgDbk3yg+fk46D/nz5OyGjnLJZPSbQz30yp 382E4VSFl4m8hBZzoLdflLf/TK4pKtnzJs4Uz2vDBueOOvi03eUlavk+2MHY7nQh663jn8 qq5uuEiSzEifj2iHO6lYz+E5IkvWr2A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787579944; 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=9l9hvkL5bSOqG1a/5X2h3Db+hMC+3FRLlC4KgN2hoZ4=; b=q6/FM78V5VJqt1RjXrUJ7DWYZyR8mgwHGF3mJHieeph8w3VY7M1/R9DLi8AUag/0mrplq9 EwmXgHxtYWNqbJCQ== Authentication-Results: smtp-out1.suse.de; none 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=9l9hvkL5bSOqG1a/5X2h3Db+hMC+3FRLlC4KgN2hoZ4=; b=ga3PBcRuWjt7SSB/hrZts7sGnoUsrWSDD7XJYWBHkEEhoSDtFHAPzsz5DU4BU4YtyrtqJ2 QgdYwGTPwtyHfR/r/ILeZtDDiOhsXDD1dvxrpeKxp7+uluUZ8A/toSLAkDzT3LdA/UkaLY h49CnbEVOmvJ5flYZwWb/+ILDQbIsF0= 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=9l9hvkL5bSOqG1a/5X2h3Db+hMC+3FRLlC4KgN2hoZ4=; b=YGSdV9RVy2M6C6coyD673+8eY4ZAlCnDNzgRrBaGHXb3+/Av+pFiaSZyElj1y5R7BX8U7Z C8ptNWQqBC8JZLDQ== 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 3BB51133D1 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 SM5eDSBOjGo+eQAAD6G6ig (envelope-from ) for ; Mon, 24 Aug 2026 13:58:56 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 04/11] [gdb/testsuite] Refactor exception handling in foreach_with_prefix Date: Mon, 24 Aug 2026 15:58:48 +0200 Message-ID: <20260824135855.1195963-5-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-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]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] 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 Refactor foreach_with_prefix using return -options. Likewise in foreach_mi_ui_mode. Both procs also have the return -level 2 problem (PR34553), so fix this using "[dict incr opts -level]". Also add a PR34553 regression test for foreach_with_prefix. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34553 --- .../gdb.testsuite/foreach_with_prefix.exp | 27 +++++++++++++++++++ gdb/testsuite/lib/gdb.exp | 12 +++------ gdb/testsuite/lib/mi-support.exp | 12 +++------ 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/gdb/testsuite/gdb.testsuite/foreach_with_prefix.exp b/gdb/testsuite/gdb.testsuite/foreach_with_prefix.exp index 04762d9baef..20a0f1022be 100644 --- a/gdb/testsuite/gdb.testsuite/foreach_with_prefix.exp +++ b/gdb/testsuite/gdb.testsuite/foreach_with_prefix.exp @@ -71,6 +71,33 @@ with_test_prefix "return" { check_sequence $seq "0 0" } +# Test TCL_RETURN (2), level 2. +foreach foreach_variant {foreach foreach_with_prefix} { + with_test_prefix "$foreach_variant: return level 2" { + proc test_return_level_2_inner {} { + set seq "" + $::foreach_variant var1 {0 1} { + $::foreach_variant var2 {0 1} { + lappend seq $var1 $var2 + return -level 2 $seq + } + } + return $seq + } + proc test_return_level_2_outer {} { + test_return_level_2_inner + return "outer" + } + + try { + set seq "initial" + set seq [test_return_level_2_outer] + } finally { + check_sequence $seq "0 0" + } + } +} + # Test TCL_BREAK (3). with_test_prefix "break" { set seq "" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index c8254ac9dd3..88a42aff4ac 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3305,20 +3305,14 @@ proc with_test_prefix { prefix body } { proc foreach_with_prefix {var list body} { upvar 1 $var myvar - set code [catch { + catch { foreach myvar $list { with_test_prefix "$var=$myvar" { uplevel 1 $body } } - } result] - - if {$code == 1} { - global errorInfo errorCode - return -code $code -errorinfo $errorInfo -errorcode $errorCode $result - } else { - return -code $code $result - } + } result opts + return -options [dict incr opts -level] $result } # Like TCL's native proc, but defines a procedure that wraps its body diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 2e87769b538..240bc844350 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -2931,20 +2931,14 @@ proc foreach_mi_ui_mode { var_name body } { set modes {"main" "separate"} } - set code [catch { + catch { foreach var $modes { with_test_prefix "$var_name=$var" { uplevel 1 $body } } - } result] - - if {$code == 1} { - global errorInfo errorCode - return -code $code -errorinfo $errorInfo -errorcode $errorCode $result - } else { - return -code $code $result - } + } result opts + return -options [dict incr opts -level] $result } # Check if GDB has information about the stderr symbol. -- 2.51.0