mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00
Code Issues Releases Activity

Optimize calls to 'eql', 'memql' and similar for fixnums.

Browse Source 
It's good practice to compare integers using 'eql' because two bignum
objects representing the same integer might not be 'eq'.  However,
'eql' is slower and doesn't have its own byte code.  Therefore,
replace it with 'eq' if one argument is guaranteed to be a fixnum on
all platforms.

* lisp/emacs-lisp/byte-opt.el (byte-optimize--fixnump): New helper
function.
(byte-optimize-equal, byte-optimize-member, byte-optimize-assoc): Use
it to optimize 'eql' etc. to 'eq' if it will always compare fixnums.
This commit is contained in:
Philipp Stephani 2021-05-06 19:13:00 +02:00
parent 4f510f63a8
commit 01bd4d1a82
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lisp/emacs-lisp/byte-opt.el
View File

@ -951,12 +951,20 @@ Same format as `byte-optimize--lexvars', with shared structure and contents.")
"Whether EXPR is a constant symbol." "Whether EXPR is a constant symbol."
(and (macroexp-const-p expr) (symbolp (eval expr)))) (and (macroexp-const-p expr) (symbolp (eval expr))))
(defun byte-optimize--fixnump (o)
"Return whether O is guaranteed to be a fixnum in all Emacsen.
See Info node `(elisp) Integer Basics'."
(and (fixnump o) (<= -536870912 o 536870911)))
(defun byte-optimize-equal (form) (defun byte-optimize-equal (form)
;; Replace `equal' or `eql' with `eq' if at least one arg is a symbol. ;; Replace `equal' or `eql' with `eq' if at least one arg is a
;; symbol or fixnum.
(byte-optimize-binary-predicate (byte-optimize-binary-predicate
(if (= (length (cdr form)) 2) (if (= (length (cdr form)) 2)
(if (or (byte-optimize--constant-symbol-p (nth 1 form)) (if (or (byte-optimize--constant-symbol-p (nth 1 form))
(byte-optimize--constant-symbol-p (nth 2 form))) (byte-optimize--constant-symbol-p (nth 2 form))
(byte-optimize--fixnump (nth 1 form))
(byte-optimize--fixnump (nth 2 form)))
(cons 'eq (cdr form)) (cons 'eq (cdr form))
form) form)
;; Arity errors reported elsewhere. ;; Arity errors reported elsewhere.
@ -964,14 +972,19 @@ Same format as `byte-optimize--lexvars', with shared structure and contents.")
(defun byte-optimize-member (form) (defun byte-optimize-member (form)
;; Replace `member' or `memql' with `memq' if the first arg is a symbol, ;; Replace `member' or `memql' with `memq' if the first arg is a symbol,
;; or the second arg is a list of symbols. ;; or the second arg is a list of symbols. Same with fixnums.
(if (= (length (cdr form)) 2) (if (= (length (cdr form)) 2)
(if (or (byte-optimize--constant-symbol-p (nth 1 form)) (if (or (byte-optimize--constant-symbol-p (nth 1 form))
(byte-optimize--fixnump (nth 1 form))
(let ((arg2 (nth 2 form))) (let ((arg2 (nth 2 form)))
(and (macroexp-const-p arg2) (and (macroexp-const-p arg2)
(let ((listval (eval arg2))) (let ((listval (eval arg2)))
(and (listp listval) (and (listp listval)
(not (memq nil (mapcar #'symbolp listval)))))))) (not (memq nil (mapcar
(lambda (o)
(or (symbolp o)
(byte-optimize--fixnump o)))
listval))))))))
(cons 'memq (cdr form)) (cons 'memq (cdr form))
form) form)
;; Arity errors reported elsewhere. ;; Arity errors reported elsewhere.
@ -979,11 +992,12 @@ Same format as `byte-optimize--lexvars', with shared structure and contents.")
(defun byte-optimize-assoc (form) (defun byte-optimize-assoc (form)
;; Replace 2-argument `assoc' with `assq', `rassoc' with `rassq', ;; Replace 2-argument `assoc' with `assq', `rassoc' with `rassq',
;; if the first arg is a symbol. ;; if the first arg is a symbol or fixnum.
(cond (cond
((/= (length form) 3) ((/= (length form) 3)
form) form)
((byte-optimize--constant-symbol-p (nth 1 form)) ((or (byte-optimize--constant-symbol-p (nth 1 form))
(byte-optimize--fixnump (nth 1 form)))
(cons (if (eq (car form) 'assoc) 'assq 'rassq) (cons (if (eq (car form) 'assoc) 'assq 'rassq)
(cdr form))) (cdr form)))
(t (byte-optimize-constant-args form)))) (t (byte-optimize-constant-args form))))