From 0a5d5c81aa180672e66a364c3a8157c9e6fb910c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 1 Feb 2025 14:09:06 -0800 Subject: [PATCH] =?utf8?q?Omit=202=20=E2=80=98volatile=E2=80=99s=20in=20in?= =?utf8?q?ternal=5Flisp=5Fcondition=5Fcase?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * src/eval.c (internal_lisp_condition_case): Omit an unnecessary ‘volatile’ and an unnecessary pointer-to-volatile local var. Perhaps these were needed in previous versions of Emacs, or to pacify older versions of GCC when using --enable-gcc-warnings, but they are not needed to pacify current GCC. (cherry picked from commit c91c591f0f0cc774647c32bdcf05bb3a9551e340) --- src/eval.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/eval.c b/src/eval.c index f83633c52c8..8cf07de20d1 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1478,7 +1478,7 @@ Lisp_Object internal_lisp_condition_case (Lisp_Object var, Lisp_Object bodyform, Lisp_Object handlers) { - struct handler *volatile oldhandlerlist = handlerlist; + struct handler *oldhandlerlist = handlerlist; /* The number of non-success handlers, plus 1 for a sentinel. */ ptrdiff_t clausenb = 1; @@ -1543,12 +1543,11 @@ internal_lisp_condition_case (Lisp_Object var, Lisp_Object bodyform, if (!CONSP (condition)) condition = list1 (condition); struct handler *c = push_handler (condition, CONDITION_CASE); - Lisp_Object volatile *clauses_volatile = clauses; if (sys_setjmp (c->jmp)) { var = var_volatile; val = handlerlist->val; - Lisp_Object volatile *chosen_clause = clauses_volatile; + Lisp_Object volatile *chosen_clause = clauses; struct handler *oldh = oldhandlerlist; for (struct handler *h = handlerlist->next; h != oldh; h = h->next) chosen_clause++; -- 2.39.5