From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AXxQC+NOjGqWVTwAWB0awg (envelope-from ) for ; Mon, 24 Aug 2026 10:02:11 -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=FubqW2BS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FH7GuTwY; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=AW+XLzSA; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=+gqLlBPq; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2A3CF1E033; Mon, 24 Aug 2026 10:02:11 -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 573791E033 for ; Mon, 24 Aug 2026 10:02:10 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F02164BA9021 for ; Mon, 24 Aug 2026 14:02:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F02164BA9021 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=FubqW2BS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FH7GuTwY; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=AW+XLzSA; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=+gqLlBPq 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 C45CA4BA9006 for ; Mon, 24 Aug 2026 13:59:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C45CA4BA9006 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 C45CA4BA9006 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=1787579953; cv=none; b=X0/6j8bkM0wL9MyNQasBNL5GeWD0P4NDKjRbDPiQn0KMdqN5CKD+AIYR/CPO6Q7SAMTk9DXNd8mldV9BhbWOXiYgv0A5JQui1KfNhZ7OB1wLfOHGloUNRKBUy8c8BmKZmCW9DjMPD0AU6jWhIWnESAxzADCdNJdZJwbeewiJ2mQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787579953; c=relaxed/simple; bh=SxYJjk4H5VBtIqLzQfWXOIQzT4tGAIhBdI2bJveRkKQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=qjx7e/jqiTk4PLlsinEIJ9R4v90aOWVGhYs1FAJwfSvPaae/gDQqK+92zc2pN6UlpepdrxKvleAk5U0pycVcNLS6eGcvevqvScvRAjl7ueNoJqPKo2UFBaCHJEm8VfQBK1vzg8MHEn5cn9Bs+eU5gMIl9MYr+kcm3eFPk0cuQOw= 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=FubqW2BS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FH7GuTwY; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=AW+XLzSA; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=+gqLlBPq DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C45CA4BA9006 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 8D7F786931 for ; Mon, 24 Aug 2026 13:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787579948; 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=fDRzA2cAPPuNyC0sAN7QhTZAnWvroJc0eAln557MNss=; b=FubqW2BS5JhF9/g+TW1G0u07xxjJDOOLieZMutypDkur+9JaWzWeLcrtthOSU6jUkI8guD ocLlWxRmZU6Vd9Xr/vGFYRVZ/aarUcOzxIro9z+ALtmny5eKGcEEeWX/AYyEVQ+x+JVnU2 f+zhZgqpNKjXSiIFRz457mIUvzLt5sI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787579948; 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=fDRzA2cAPPuNyC0sAN7QhTZAnWvroJc0eAln557MNss=; b=FH7GuTwYJT8H4nTU9Dsptxf+b+2dusCCVmsKwdriUCiimr/eNkSOdQy119ya3f8wXRQh9e QCIK2iTC16ckaxCg== Authentication-Results: smtp-out1.suse.de; none 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=fDRzA2cAPPuNyC0sAN7QhTZAnWvroJc0eAln557MNss=; b=AW+XLzSAVShGRnn7vO+FQwsEtZkx0vN+s0EwtyQKo4u2h3GsIzHU/b72KLLqSmvRoi68y5 ftvC/9NyX11D/TrrQdpqgJOpp1ZVKyeHEmLU2mreA2JH5PJ2HzR27oU9Eaw3RYIA9ggv+X TXa/HtKN/hF3UrgopWsmwrUmZGju8Lc= 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=fDRzA2cAPPuNyC0sAN7QhTZAnWvroJc0eAln557MNss=; b=+gqLlBPqDP1oK/PTyt6R6msWxcVUkJ7cayLfxba+5+fX5JqN4ssbUj7Sr+GgziXbQ+eCzN HAAoMeG7V5nqJkDg== 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 F243713411 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 oE3nOSBOjGo+eQAAD6G6ig (envelope-from ) for ; Mon, 24 Aug 2026 13:58:56 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 11/11] [gdb/testsuite] Refactor exception handling in with_stub_devices Date: Mon, 24 Aug 2026 15:58:55 +0200 Message-ID: <20260824135855.1195963-12-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)[99.99%]; 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)[imap1.dmz-prg2.suse.org:helo,suse.de:mid]; 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 Use with_override and try/finally to simplify with_stub_devices. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34552 --- gdb/testsuite/gdb.rocm/hcc-amdgpu-targets.exp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.rocm/hcc-amdgpu-targets.exp b/gdb/testsuite/gdb.rocm/hcc-amdgpu-targets.exp index 8f04cca7981..7f90a112138 100644 --- a/gdb/testsuite/gdb.rocm/hcc-amdgpu-targets.exp +++ b/gdb/testsuite/gdb.rocm/hcc-amdgpu-targets.exp @@ -24,13 +24,16 @@ load_lib rocm.exp # Run BODY with find_amdgpu_devices stubbed to return DEVICES, then # restore the original proc. proc with_stub_devices {devices body} { - rename find_amdgpu_devices __saved_find_amdgpu_devices # tclint-disable-next-line command-args - proc find_amdgpu_devices {} [list return $devices] - set code [catch {uplevel 1 $body} result] - rename find_amdgpu_devices {} - rename __saved_find_amdgpu_devices find_amdgpu_devices - return -code $code $result + proc with_stub_devices_find_amdgpu_devices {} [list return $devices] + try { + # tclint-disable-next-line command-args + with_override \ + find_amdgpu_devices with_stub_devices_find_amdgpu_devices \ + $body + } finally { + rename with_stub_devices_find_amdgpu_devices {} + } } # Tests using find_amdgpu_devices (no HCC_AMDGPU_TARGET env var). -- 2.51.0