From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: master 0a57dfcff8d 2/2: Ensure that specbind arg is always bare symbol, and drop check Date: Fri, 19 Apr 2024 21:48:47 -0400 Message-ID: References: <171344154944.7691.6557554183289684123@vcs2.savannah.gnu.org> <20240418115910.3182CC1FB65@vcs2.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34471"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Mattias =?windows-1252?Q?Engdeg=E5rd?= To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Apr 20 03:49:41 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rxzrI-0008lK-Uk for ged-emacs-devel@m.gmane-mx.org; Sat, 20 Apr 2024 03:49:41 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxzqZ-0001fK-9F; Fri, 19 Apr 2024 21:48:55 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rxzqX-0001f6-FJ for emacs-devel@gnu.org; Fri, 19 Apr 2024 21:48:53 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rxzqV-0002EJ-MU for emacs-devel@gnu.org; Fri, 19 Apr 2024 21:48:53 -0400 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id EE5BB442E5B; Fri, 19 Apr 2024 21:48:49 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1713577728; bh=Yx0yhLhTz6stFdsxXSqt1YXpmLVfh2AQ4VGbSNbRPCM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Jl7MwVINZpuzC5P0ylvpqQ3V67PDs1xwLFT+JHZCo88vzN9VHh9D/7GNv6N3sGlKz wepsoMXB0xiRhiGXUtKX3ZEt/EQxVlEKt1DB5xkJLrJW2ipyoMqun1MSRHAwbfwDeo Vcy07VJRXgvBC0EbwgTBBEPe1JcMVi7C4cVLqdG/6oa2ZE7vUXIkyIlF6VViWpWDAT zi9GVmfY2fQN4stUhotJkcGxP8MOiXieAbdIau+SiFwdK9cqfjYdogHDMnMezPKmRA 8e93wannJbLh53g9sLvRmb+zzj8mxvY8uG9egVT/tIOkv1FswhC94hh8A0HPDXJJiO KBIqI+7AGY78Q== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 691D4442E58; Fri, 19 Apr 2024 21:48:48 -0400 (EDT) Original-Received: from pastel (unknown [45.72.201.215]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 42C47120250; Fri, 19 Apr 2024 21:48:48 -0400 (EDT) In-Reply-To: <20240418115910.3182CC1FB65@vcs2.savannah.gnu.org> ("Mattias =?windows-1252?Q?Engdeg=E5rd?= via Mailing list for Emacs changes"'s message of "Thu, 18 Apr 2024 07:59:10 -0400 (EDT)") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:317855 Archived-At: > Ensure that specbind arg is always bare symbol, and drop check > > * src/eval.c (FletX, Flet, internal_lisp_condition_case) > (funcall_lambda): Ensure that the first argument to `specbind` is > a bare symbol in the few cases where this isn't statically guaranteed. > (specbind): Drop the symbol argument type check on the fast path. Shouldn't we signal an error if the first arg to `specbind` is a sympos instead of bending over backward to accommodate incorrect use? Maybe I'm missing some context, but IIRC we had concluded that if sympos reach actual evaluation it's a sign of a bug upstream. Stefan > --- > src/eval.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/src/eval.c b/src/eval.c > index 7f7a70b15ae..c5b8a375af4 100644 > --- a/src/eval.c > +++ b/src/eval.c > @@ -948,8 +948,9 @@ usage: (let* VARLIST BODY...) */) > val = eval_sub (Fcar (XCDR (elt))); > } > > - if (!NILP (lexenv) && SYMBOLP (var) > - && !XSYMBOL (var)->u.s.declared_special > + var = maybe_remove_pos_from_symbol (var); > + if (!NILP (lexenv) && BARE_SYMBOL_P (var) > + && !XBARE_SYMBOL (var)->u.s.declared_special > && NILP (Fmemq (var, Vinternal_interpreter_environment))) > /* Lexically bind VAR by adding it to the interpreter's binding > alist. */ > @@ -1016,11 +1017,10 @@ usage: (let VARLIST BODY...) */) > varlist = XCAR (args); > for (argnum = 0; argnum < nvars && CONSP (varlist); argnum++) > { > - Lisp_Object var; > - > elt = XCAR (varlist); > varlist = XCDR (varlist); > - var = SYMBOLP (elt) ? elt : Fcar (elt); > + Lisp_Object var = maybe_remove_pos_from_symbol (SYMBOLP (elt) ? elt > + : Fcar (elt)); > tem = temps[argnum]; > > if (!NILP (lexenv) && SYMBOLP (var) > @@ -1416,6 +1416,7 @@ internal_lisp_condition_case (Lisp_Object var, Lisp_Object bodyform, > struct handler *oldhandlerlist = handlerlist; > ptrdiff_t CACHEABLE clausenb = 0; > > + var = maybe_remove_pos_from_symbol (var); > CHECK_SYMBOL (var); > > Lisp_Object success_handler = Qnil; > @@ -3254,7 +3255,7 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs, Lisp_Object *arg_vector) > lexenv = Fcons (Fcons (next, arg), lexenv); > else > /* Dynamically bind NEXT. */ > - specbind (next, arg); > + specbind (maybe_remove_pos_from_symbol (next), arg); > previous_rest = false; > } > } > @@ -3466,10 +3467,8 @@ do_specbind (struct Lisp_Symbol *sym, union specbinding *bind, > void > specbind (Lisp_Object symbol, Lisp_Object value) > { > - struct Lisp_Symbol *sym; > - > - CHECK_SYMBOL (symbol); > - sym = XSYMBOL (symbol); > + /* The caller must ensure that the SYMBOL argument is a bare symbol. */ > + struct Lisp_Symbol *sym = XBARE_SYMBOL (symbol); > > start: > switch (sym->u.s.redirect)