From 63a1f317d05c8eed256251e7952e621a37b5cf7b Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Sun, 20 Oct 2019 11:02:16 +0200 Subject: [PATCH] fix comp-limplify-block when falling through a return --- lisp/emacs-lisp/comp.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index fe3c1dde93e..03ace885f85 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -1054,10 +1054,10 @@ The block name is returned." do (comp-limplify-lap-inst inst) (cl-incf (comp-limplify-pc comp-pass)) (pcase next-inst - (`(TAG ,_label . ,target-sp) + (`(TAG ,_label . ,label-sp) (when fall-through - (cl-assert (= (1- target-sp) (comp-sp)))) - (let ((next-bb (comp-add-pending-block (comp-sp)))) + (cl-assert (= (1- label-sp) (comp-sp)))) + (let ((next-bb (comp-add-pending-block (1- label-sp)))) (when fall-through (comp-emit `(jump ,next-bb)))) (return))) -- 2.39.5