From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id CRmyGO/Zr2pe+SUAWB0awg (envelope-from ) for ; Sun, 20 Sep 2026 09:04:47 -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=niN0XurV; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=AhvL5avQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=cF4aeF83; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=V8HI9694; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 600FD1E051; Sun, 20 Sep 2026 09:04:47 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.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,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED 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 CEFC41E01F for ; Sun, 20 Sep 2026 09:04:46 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6E66F4BA9001 for ; Sun, 20 Sep 2026 13:04:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6E66F4BA9001 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=niN0XurV; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=AhvL5avQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=cF4aeF83; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=V8HI9694 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id C00274BA79AD for ; Sun, 20 Sep 2026 13:03:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C00274BA79AD 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 C00274BA79AD 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=1789909384; cv=none; b=Ol7clhVkFZpNhyyfXtDyGwApxi4FWMby7gk+6eT9WP9yVeYHs+cUAMXz1mxbAWXAidRHv24hwibRgoI28pUu4IWWeC3H6LNi6pMQRB8bNPKIMLA/eBXsuXTICDKAgSO2g7g9YdWEBfzrc2dmwW9VOjqyqfUB+tU46SFlA+AZMjY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1789909384; c=relaxed/simple; bh=WywVTvDnM9GswtDBXIhVHDuhxiSeYEVaCtdp3yqAUw8=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=azAPz8tglqMl7Yzkj/lcJHXe/7C54yKEiTd0VbZp7NKlsl5SKmeLv43hLOjEx37Fl3w0ZhsaR/+AvozgOu32PNeU8lLqyW0QbmCifUhCAeKe5CfDWXal7sOL63MS4r6biwuyMwdKtGMu2a5lcVfhdvi4ENHqL5uHgSimF63PW0g= 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=niN0XurV; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=AhvL5avQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=cF4aeF83; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=V8HI9694 DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C00274BA79AD 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-out2.suse.de (Postfix) with ESMTPS id 8AAC71F7B9 for ; Sun, 20 Sep 2026 13:02:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1789909379; 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=/IFPt6bFz7A/3OTWQvtc7pFeBVFoE3vSN3yZ6anQWNE=; b=niN0XurVN9hqyssJXIcwJWm4owJK/MLDBvUsvtdkLYrlS0+6q/4O5c8TocQ+mYyR14ITnL rjCP4JUzIyi2OOGLbT69ZLFW1oUYXLOq6FkzsWg2NC7Oo+e4wcJqab4xLs/9k9YaWq0NVZ UxplDQmDKx9LC49txnhJbL0twBzG7/g= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1789909379; 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=/IFPt6bFz7A/3OTWQvtc7pFeBVFoE3vSN3yZ6anQWNE=; b=AhvL5avQvXxdZxbG80BY2IkZzeZfgvou7PF7Rk+03BYWHeiBTz84hHzeEtTGSRKqRQ+Nhj tWqievIn9T0tk/Cw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1789909375; 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=/IFPt6bFz7A/3OTWQvtc7pFeBVFoE3vSN3yZ6anQWNE=; b=cF4aeF83S7xv8rMoOIo1vEJpHmLqpGCQBZMEAAaBhU4lOXKZh/QKw3iVwD1d2GURdxiEip ZPCqMdD0F1FD4RzS96Sh/pAypmHePDOw4b8Vp1mh/aU1rq1sPX67H/uoCYzs9QM2bFsycr dJOK8GDuazgarnNoGg0ryocq3bekCTo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1789909375; 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=/IFPt6bFz7A/3OTWQvtc7pFeBVFoE3vSN3yZ6anQWNE=; b=V8HI96944VISF7aS+7n/fLrNBOkmym4MUA7bspcw9SCGdpkwdOaZZ4R/IEcXMZrpeYCQbW 4z8a5nK4y8ryx4BA== 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 0953F139CE for ; Sun, 20 Sep 2026 13:02:55 +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 ZSczF37Zr2rzEAAAD6G6ig:T5 (envelope-from ) for ; Sun, 20 Sep 2026 13:02:55 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 4/4] [gdb] Use make_scoped_restore in captured_main_1 Date: Sun, 20 Sep 2026 15:02:54 +0200 Message-ID: <20260920130254.604592-5-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260920130254.604592-1-tdevries@suse.de> References: <20260920130254.604592-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)[-0.996]; 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 Use make_scoped_restore in captured_main_1 to protect a cleanup against exceptions. I don't think this is strictly necessary: exceptions that escape out of captured_main_1 are printed, after which gdb exits, so the state of the global_auto_load doesn't matter much at that point. But using make_scoped_restore probably captures the intent better. I used std::optional to avoid indenting the code in between the save and restore. --- gdb/main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gdb/main.c b/gdb/main.c index f49d5f48c9d..ea7ecc468e6 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -652,7 +652,6 @@ captured_main_1 (struct captured_main_args *context) std::vector dirarg; int i; - int save_auto_load; int ret = 1; /* Check for environment variables which might cause GDB to start with @@ -1238,8 +1237,8 @@ captured_main_1 (struct captured_main_args *context) /* Skip auto-loading section-specified scripts until we've sourced local_gdbinit (which is often used to augment the source search path). */ - save_auto_load = global_auto_load; - global_auto_load = 0; + std::optional> + auto_load_restore (make_scoped_restore (&global_auto_load, false)); if (execarg != nullptr && symarg != nullptr && streq (execarg, symarg)) { @@ -1333,7 +1332,7 @@ captured_main_1 (struct captured_main_args *context) processed, we can read any scripts mentioned in SYMARG. We wait until now because it is common to add to the source search path in local_gdbinit. */ - global_auto_load = save_auto_load; + auto_load_restore.reset (); for (objfile &objfile : current_program_space->objfiles ()) load_auto_scripts_for_objfile (objfile); -- 2.51.0