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.

1 files 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)