From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id saOiHXgutWr7AT0AWB0awg (envelope-from ) for ; Thu, 24 Sep 2026 10:06:48 -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=yzIskqsa; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=KohiyN91; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=lSN7oT3D; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=PcGUtSvp; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 7429C1E06B; Thu, 24 Sep 2026 10:06:48 -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 C4FBC1E01F for ; Thu, 24 Sep 2026 10:06:47 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8AB594BB589C for ; Thu, 24 Sep 2026 14:06:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8AB594BB589C 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=yzIskqsa; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=KohiyN91; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=lSN7oT3D; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=PcGUtSvp Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 2805B4BB3BE8 for ; Thu, 24 Sep 2026 14:06:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2805B4BB3BE8 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 2805B4BB3BE8 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790258775; cv=none; b=SH6zvMxkzStcKaThKzGJH7lFE3fQZhU6xLr8zwdiaJx4fJJEmidgY32SGwBHcbY9snw5ki6vR3HDTV7kng9hVh6prp2BtNIRFOCkAAF3/EAROSb2E5bC76pPofr7aVt3eGVxWpqVq7Ou7ANisiUuqTXsTgZ2heJXe6OGZTF8wMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790258775; c=relaxed/simple; bh=rj5IMo04tY0mB+8OSnfq44pwH22XUug7wzPHdSgrElA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=Ns4oFC0lTVEFUzeVfyhd5JigfjJY06EDt+k/xFWgdMcSt1P6L0whUgjgKiT1QYVmvyxWnIB3sUSPKaYtkp1Bbz6HhUXi61TEA8NVTofEqtNnsBaV9exxdJPOAg5IEwEAFcIP4HtTsKFITi6roALJnmF3I/o73XVn+StfzyDcKnE= 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=yzIskqsa; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=KohiyN91; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=lSN7oT3D; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=PcGUtSvp DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2805B4BB3BE8 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 10A75200ED for ; Thu, 24 Sep 2026 14:06:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790258770; 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=NtGOuoc+s1ohQrqHWOqCU5TQ+pWZqQEboZGXf+F2QQ8=; b=yzIskqsaTiRkutfm3bcxh9iSvimCUJpNXB36qzSfhFb4hVul413YIYZJsrlop79z9cjtiB dluEYSrIacB9jwdOezHxhp2hmBF6IwR7iWnaH0J9N6qFg6PxfchKu9QiLVNaV2qLdQa8RO rXMA7mLbcm/WOdbimac5OxLJl9bBNbs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790258770; 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=NtGOuoc+s1ohQrqHWOqCU5TQ+pWZqQEboZGXf+F2QQ8=; b=KohiyN91pJURb+pDjZb6CmF+yESdU4RiY1t93tr+c+nF5aHek2JFE1kbilZRMjidOkYzAS HCb+415r3P/L75Ag== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=lSN7oT3D; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=PcGUtSvp DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790258766; 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=NtGOuoc+s1ohQrqHWOqCU5TQ+pWZqQEboZGXf+F2QQ8=; b=lSN7oT3DUnlIZ25jvu1HfTqKOFnXu5+Wo6ZmhaCR/XP2nPXHBx1sZitf9bGcEyI7Yqz4L3 o9Wz9wvGtmhXVklqkZxURPjmwVgPYEDo4mKJw0EP4X+hqhhEtkLJvoRL8Kk95a+Ig9N+YG c0th8Jwfaky6OPTPBG9TSnpQPXNJe+s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790258766; 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=NtGOuoc+s1ohQrqHWOqCU5TQ+pWZqQEboZGXf+F2QQ8=; b=PcGUtSvpKRg9JSjS4ee4UfhYnubR1ySiSQGB6DpnvP8kEDRoWEQMTlFBk9b+MZ0pp46v7+ +hmlo4U0Fvt3lVDQ== 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 CA3C813354 for ; Thu, 24 Sep 2026 14:06:05 +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 JodsG00utWpjVQAAD6G6ig (envelope-from ) for ; Thu, 24 Sep 2026 14:06:05 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed 1/3] [gdb/testsuite] Use transparent_uplevel in foreach_with_prefix Date: Thu, 24 Sep 2026 16:06:02 +0200 Message-ID: <20260924140605.1009056-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 10A75200ED X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; 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)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:dkim,suse.de:mid]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] 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 After the 2 previous commits: - foreach_with_prefix is simplified (foreach handles break and continue), and - PR34553 is fixed in foreach_with_prefix (added -level increment). It now looks like this: ... proc foreach_with_prefix {var list body} { upvar 1 $var myvar catch { foreach myvar $list { with_test_prefix "$var=$myvar" { uplevel 1 $body } } } result opts return -options [dict incr opts -level] $result ... However, IWBN to use transparent_uplevel, which ideally should replace the catch, the uplevel and the -level increment. I finally came up with this solution: ... transparent_uplevel [subst_vars { foreach $var {$list} { with_test_prefix "$var=[set $var]" { $body } } }] ... which also gets rid of the myvar. The only gotcha is that the implementation is wrapped in [subst_vars {}], which provides a way to get values of variables defined in: - the foreach_with_prefix using $var, and - the caller using [set var]. --- gdb/testsuite/lib/gdb.exp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index cad1ac65913..589e25a12e1 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3356,15 +3356,13 @@ proc with_test_prefix { prefix body } { # including the iterator's name and current value in the prefix. proc foreach_with_prefix {var list body} { - upvar 1 $var myvar - catch { - foreach myvar $list { - with_test_prefix "$var=$myvar" { - uplevel 1 $body + transparent_uplevel [subst_vars { + foreach $var {$list} { + with_test_prefix "$var=[set $var]" { + $body } } - } result opts - return -options [dict incr opts -level] $result + }] } # Like TCL's native proc, but defines a procedure that wraps its body base-commit: 0b17fe8b941e1b95535caa61664e96b19c607777 -- 2.51.0