From fcab7f72e1765b883537a0ae2c3a82a802539375 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Sun, 22 Sep 2019 09:59:14 +0200 Subject: [PATCH] fix comp-new-block-sym --- lisp/emacs-lisp/comp.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index b5d54289deb..527d855af6f 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -599,11 +599,11 @@ If NEGATED non nil negate the tested condition." (comp-slot+1)))))) (defun comp-new-block-sym () - "Return a symbol naming the next new basic block." - (intern (format "bb_%s" (hash-table-count (comp-func-blocks comp-func))))) + "Return a unique symbol naming the next new basic block." + (intern (format "bb_%s" (funcall (comp-func-block-cnt-gen comp-func))))) (defun comp-lap-to-limple-bb (n) - "Given the LAP label N return the limple basic block." + "Given the LAP label N return the limple basic block name." (let ((hash (comp-func-lap-block comp-func))) (if-let ((bb (gethash n hash))) ;; If was already created return it. @@ -950,7 +950,7 @@ This will be called at runtime." (comp-emit-narg-prologue args-min nonrest) (cl-incf (comp-sp) (1+ nonrest)))) ;; Body - (comp-emit-block 'bb_1) + (comp-emit-block (comp-new-block-sym)) (mapc #'comp-limplify-lap-inst (comp-func-lap func)) (comp-limplify-finalize-function func))) -- 2.39.5