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

Byte compiler: remove symbol positions from byte-switch tables

Browse source 
This fixes bug #54990.

* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Remove positions from
symbols with positions in byte-switch tables, by temporarily removing the
entries from the table, and reinserting them amended.
This commit is contained in:
Alan Mackenzie 2022-04-18 10:19:54 +00:00
parent d5f2305187
commit 2b6a1c98df
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/emacs-lisp/bytecomp.el
View file

@ -1009,13 +1009,22 @@ CONST2 may be evaluated multiple times."
;; Similarly, replace TAGs in all jump tables with the correct PC index.
(dolist (hash-table byte-compile-jump-tables)
(maphash #'(lambda (value tag)
(setq pc (cadr tag))
;; We don't need to split PC here, as it is stored as a lisp
;; object in the hash table (whereas other goto-* ops store
;; it within 2 bytes in the byte string).
(puthash value pc hash-table))
hash-table))
(let (alist)
(maphash #'(lambda (value tag)
(setq pc (cadr tag))
;; We don't need to split PC here, as it is stored as a
;; lisp object in the hash table (whereas other goto-*
;; ops store it within 2 bytes in the byte string).
;; De-position any symbols with position in `value'.
;; Since this may change the hash table key, we remove
;; the entry from the table and reinsert it outside the
;; scope of the `maphash'.
(setq value (byte-run-strip-symbol-positions value))
(push (cons value pc) alist)
(remhash value hash-table))
hash-table)
(dolist (elt alist)
(puthash (car elt) (cdr elt) hash-table))))
(let ((bytecode (apply 'unibyte-string (nreverse bytes))))
(when byte-native-compiling
;; Spill LAP for the native compiler here.