procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

byte-opt: Replace merged tags in jump tables too. (bug#25716)

Browse source 
* lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): While merging
  adjacent tags, make sure that the old tag is replaced in all jump
  tables, if any. This fixes the bytecode VM jumping to the wrong
  address in compiled cond forms where the body of a clause was a loop
  of any sort.
This commit is contained in:
Vibhav Pant 2017-02-14 21:47:59 +05:30
parent c1eb871e92
commit 71b90192da
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/emacs-lisp/byte-opt.el
View file

@ -1752,12 +1752,22 @@ If FOR-EFFECT is non-nil, the return value is assumed to be of no importance."
(setcdr tmp2 lap1)
(setq tmp3 (cdr (memq tmp2 tmp3))))
(setq lap (delq lap0 lap)
keep-going t))
keep-going t)
;; replace references to tag in jump tables, if any
(dolist (table byte-compile-jump-tables)
(catch 'break
(maphash #'(lambda (value tag)
(when (equal tag lap0)
;; each tag occurs only once in the jump table
(puthash value lap1 table)
(throw 'break nil)))
table))))
;;
;; unused-TAG: --> <deleted>
;;
((and (eq 'TAG (car lap0))
(not (rassq lap0 lap))
;; make sure this tag isn't used in a jump-table
(cl-loop for table in byte-compile-jump-tables
when (member lap0 (hash-table-values table))
return nil finally return t))