From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kXifIFROjGqWVTwAWB0awg (envelope-from ) for ; Mon, 24 Aug 2026 09:59: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=2AoiHENW; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ErmYMTyR; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=O5StFxkr; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Tmu+Ae9R; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 7F3AF1E0A3; Mon, 24 Aug 2026 09:59: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 9FA671E033 for ; Mon, 24 Aug 2026 09:59:47 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CC3D64BA9006 for ; Mon, 24 Aug 2026 13:59:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CC3D64BA9006 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=2AoiHENW; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ErmYMTyR; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=O5StFxkr; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Tmu+Ae9R 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 4B2C84BA9030 for ; Mon, 24 Aug 2026 13:59:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4B2C84BA9030 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 4B2C84BA9030 Authentication-Results: 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=1787579949; cv=none; b=nmcDKlTEvcf0A7E+eBbBNE+3yi4I3FJ1viFEQ92njXwUVQA9VzinBhwOBWn61S9hk23jdSn21Q7Bsj3ygmgb7CkNT2leu93yGg79vIJiN7IscA+GEQj8cKtOc0+5koWnClOBdQYDjcL9ipUYJVCF9eQJSZITX6lXp9BOvfxxqUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579949; c=relaxed/simple; bh=FvA984ygX0jAmLDyOT00OXB8pyBGjBIftbyQi5zh2fI=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=lZkVsxa/PotNSfkx9pRrEicu8D9O7AvapFwwBf0FuetbwsX6LMvofGfIWJQFeL11sNPjgSQCs7edtxMiXwNNeC+fahsvN8Pohfc0Cvf5MjLjIJ4lNvFFnkGsnP/Jy/lLKSquDBEEdCpuk27uGurpMHDDKHPr20+m2b1XNZcC1wU= 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=2AoiHENW; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ErmYMTyR; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=O5StFxkr; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Tmu+Ae9R DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B2C84BA9030 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 247E486967 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=9/u8Moior/yavtn6zIOuRBlB6bCc+SFUsbP/jnb2VUo=; b=2AoiHENWGrQp67aoFF8KkJXKyxkn8VxZFCOJ3hJNP0Qg4Hu+cBlQDW6WcCPRQprNioUoDj b2ig5SlFfJLHDOWA+nObvtsqK3qdPuxaQ6YHny9f7zZlnKA1pW4VQTOurFImX+ib5TVH7U sbsZHu6yObkxgQRAsJCvR2HDvFdvF+I= 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=9/u8Moior/yavtn6zIOuRBlB6bCc+SFUsbP/jnb2VUo=; b=ErmYMTyRsaVUBqFgUAhU4E9ItITXzAz8a0xJJmhYOjbUdMwQfvbFL60yeY46wGe/k3D1eB IofZRdKnAoZNdlAg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=O5StFxkr; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Tmu+Ae9R 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=9/u8Moior/yavtn6zIOuRBlB6bCc+SFUsbP/jnb2VUo=; b=O5StFxkr9gRddHFH+yJCa0F0MmC1yaNwKXKGLRTaISMwDWtYqD41HUDzyemvKAXK15/jfW fBaD5BLfRlGXGXlMY3j4kX9nJNzAScHYmkWrPDRcuhd1TqTQPA9BNW58D8LOR/C5UNM9RW Q2pB8JnqaAPQvEgGcyMfuICTeXkSljw= 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=9/u8Moior/yavtn6zIOuRBlB6bCc+SFUsbP/jnb2VUo=; b=Tmu+Ae9RSZdrG1tfXC+mPfxB62I1AKPmJMg/0vwsEYMuAQMEAOyGQHJhQOxn4ROnJLmeJv qHimyhtiic5ZqVCA== 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 56CE3133F1 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 4Ai4EyBOjGo+eQAAD6G6ig (envelope-from ) for ; Mon, 24 Aug 2026 13:58:56 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 05/11] [gdb/testsuite] Add transparent_uplevel Date: Mon, 24 Aug 2026 15:58:49 +0200 Message-ID: <20260824135855.1195963-6-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: 247E486967 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)[]; 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)[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 Having learned the trick of increasing -level, factor out a new proc transparent_uplevel: ... proc transparent_uplevel { body } { catch {uplevel 2 $body} result opts return -options [dict incr opts -level 2] $result ... to be used in conjunction with try/finally to apply this pattern: ... proc foo { body } { try { transparent_uplevel $body } finally { } } ... such that "foo body" has the same effect as "body", apart from the / parts. This proc has the fix for PR34553 designed into it, so (correctly) applying it in a proc will fix the PR there. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34553 --- gdb/testsuite/lib/gdb.exp | 47 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 88a42aff4ac..853b45f4a53 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3218,6 +3218,53 @@ gdb_caching_proc allow_tui_tests {} { return [expr {[string first "--enable-tui" $output] != -1}] } +# Run BODY in the context of the callers caller. +# +# To be used in a proc foo: +# proc foo {body} { +# transparent_uplevel body +# } +# to make "foo body" have the same effect as "body". +# +# It ensures this by doing two things: +# - evaluating the body in the context of the caller of foo +# - propagating any return, exceptional or not to the caller of foo. +# +# Typically used in conjunction with try/finally, to ensure something +# happens before and after body. For instance, this: +# proc foo {body} { +# try { +# puts "foo: enter" +# transparent_uplevel $body +# } finally { +# puts "foo: exit" +# } +# } +# +# for {set i 0} {$i < 5} {incr i} { +# puts $i +# foo { +# if {$i == 2} { +# break +# } +# } +# } +# produces: +# 0 +# foo: enter +# foo: exit +# 1 +# foo: enter +# foo: exit +# 2 +# foo: enter +# foo: exit + +proc transparent_uplevel { body } { + catch {uplevel 2 $body} result opts + return -options [dict incr opts -level 2] $result +} + # Test files shall make sure all the test result lines in gdb.sum are # unique in a test run, so that comparing the gdb.sum files of two # test runs gives correct results. Test files that exercise -- 2.51.0