From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id CXQ6JuHZr2pe+SUAWB0awg (envelope-from ) for ; Sun, 20 Sep 2026 09:04:33 -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=GVFEdgiS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oSfpqfA5; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=hoQJkXvG; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=dQ6sUMzF; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 989011E051; Sun, 20 Sep 2026 09:04:33 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=no 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 367521E01F for ; Sun, 20 Sep 2026 09:04:33 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C68A14B9DB69 for ; Sun, 20 Sep 2026 13:04:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C68A14B9DB69 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=GVFEdgiS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oSfpqfA5; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=hoQJkXvG; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=dQ6sUMzF Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 93A804BA79A6 for ; Sun, 20 Sep 2026 13:03:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 93A804BA79A6 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 93A804BA79A6 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=wo52qNeK6NqP1UPxiPFCfn2t+8tP56qVis3jKgidZxPuHyuixtBwP9TB7oyw+e11VOIhjUEuHRwfowTIjrV7+i9NHQdXFhjiUNlVi9BxWnsSL3In/PKsX+MiB06Ks/JMy+YuSxn+Oz/vKvmvWLhx9vRJLMqCHXyLJF/N4FGiCWw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1789909384; c=relaxed/simple; bh=LhM+K+6MNON9cKxVfirJj1e7abIVP8AIfbAf0eHlhu0=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=qMPlR3piviqLQ21xUHxEw4KzQV5rpU2nR87dzKfYxCF27RPLmJwySDuDIaBR79d7zpRhYBIhJhFIknyRhlJ62DcYZtTL1td72e2fLKaDWht92POjgM4QFs2HRVJnFwNpH32QukeucDdH02kf1+uWTUXt5CjUs7Ixxkhq1J2aNPs= 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=GVFEdgiS; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oSfpqfA5; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=hoQJkXvG; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=dQ6sUMzF DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93A804BA79A6 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 5F8C61F786 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=Q+/Nit5vs4pBQPvWqITnU16HkN4O9Rit+0CTCSFwl/E=; b=GVFEdgiSwtzTXL7ACSE2dC/v5ulAoeUNXA+QLFiIJfFqgV1FDg3+nurwpfEYOdfEDiJx+G FoBRVhXUzv2KmlXvfuAr66L8fH47liMB4YMMhIXBpqdp+21jnnbz0CqZfIo9TrOLAXJExP BH2j4bkFY4g1RWz5lDEkPvUMO+NAceM= 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=Q+/Nit5vs4pBQPvWqITnU16HkN4O9Rit+0CTCSFwl/E=; b=oSfpqfA58OYEC9DJJuq+qQCio46FwT8+NoVg8XoCazUJkxwrN/Z5XfdvUiangXHnib+mcm 5VOfe0WJWZ/BibCg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=hoQJkXvG; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dQ6sUMzF 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=Q+/Nit5vs4pBQPvWqITnU16HkN4O9Rit+0CTCSFwl/E=; b=hoQJkXvGP5XjmLlwnoFL9vN5w0pcFLb13m0Xt2WfWWzsLeIAfZn/PlkVRKCchNRKljLd4r KvL1KLDdbpus2qKGVfpdjJ1NZAiKlYB+GkyQkNjcvIxf518GtjOnQyK6aHcDwoEnP1F1WT jcDqzoRGkj3MefkN3+nlwXE8xyh5h+I= 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=Q+/Nit5vs4pBQPvWqITnU16HkN4O9Rit+0CTCSFwl/E=; b=dQ6sUMzFmdG97T3FGLopBlRW734kPwvhlWOC0u+y+Ozz63DQ71Mv2Jy0JHGJI9jJzlJ6qU inGcCm2MCL5vFuBw== 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 E40BC139CA for ; Sun, 20 Sep 2026 13:02:54 +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:T4 (envelope-from ) for ; Sun, 20 Sep 2026 13:02:54 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 3/4] [gdb] Use make_scoped_restore in linespec_lexer_peek_token Date: Sun, 20 Sep 2026 15:02:53 +0200 Message-ID: <20260920130254.604592-4-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-Rspamd-Queue-Id: 5F8C61F786 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Action: no action 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)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim,suse.de:mid]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; 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 Use make_scoped_restore in linespec_lexer_peek_token to protect cleanups against exceptions. --- gdb/linespec.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gdb/linespec.c b/gdb/linespec.c index b6505ba283d..95ad0b048d2 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -1037,20 +1037,16 @@ linespec_lexer_consume_token (linespec_parser *parser) static linespec_token linespec_lexer_peek_token (linespec_parser *parser) { - linespec_token next; - const char *saved_stream = parser->lexer.stream; - linespec_token saved_token = parser->lexer.current; - int saved_completion_quote_char = parser->completion_quote_char; - const char *saved_completion_quote_end = parser->completion_quote_end; - const char *saved_completion_word = parser->completion_word; - - next = linespec_lexer_consume_token (parser); - parser->lexer.stream = saved_stream; - parser->lexer.current = saved_token; - parser->completion_quote_char = saved_completion_quote_char; - parser->completion_quote_end = saved_completion_quote_end; - parser->completion_word = saved_completion_word; - return next; + scoped_restore stream_restore = make_scoped_restore (&parser->lexer.stream); + scoped_restore token_restore = make_scoped_restore (&parser->lexer.current); + scoped_restore completion_quote_char_restore + = make_scoped_restore (&parser->completion_quote_char); + scoped_restore completion_quote_end_restore + = make_scoped_restore (&parser->completion_quote_end); + scoped_restore completion_word_restore + = make_scoped_restore (&parser->completion_word); + + return linespec_lexer_consume_token (parser); } /* Helper functions. */ -- 2.51.0