From c3d0e2a09fd72aa9209dda3057bbb02f6a3b3df6 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Sun, 8 Nov 2020 10:40:05 +0100 Subject: [PATCH] * Rename two nativecomp functions * lisp/emacs-lisp/comp.el (comp-function-foldable-p): Rename from comp-function-optimizable-p. (comp-function-call-maybe-fold): Same from comp-function-call-maybe-fold. --- lisp/emacs-lisp/comp.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 887a6a503ec..8bee8afeacf 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -2223,12 +2223,12 @@ Forward propagate immediate involed in assignments." (comp-mvar-constant lval) (comp-mvar-constant rval) (comp-mvar-type lval) (comp-mvar-type rval))) -(defsubst comp-function-optimizable-p (f args) +(defsubst comp-function-foldable-p (f args) "Given function F called with ARGS return non-nil when optimizable." (and (cl-every #'comp-mvar-const-vld args) (comp-function-pure-p f))) -(defsubst comp-function-call-maybe-remove (insn f args) +(defsubst comp-function-call-maybe-fold (insn f args) "Given INSN when F is pure if all ARGS are known remove the function call." (cl-flet ((rewrite-insn-as-setimm (insn value) ;; See `comp-emit-setimm'. @@ -2243,7 +2243,7 @@ Forward propagate immediate involed in assignments." comp-symbol-values-optimizable))) (rewrite-insn-as-setimm insn (symbol-value (comp-mvar-constant (car args)))))) - ((comp-function-optimizable-p f args) + ((comp-function-foldable-p f args) (ignore-errors ;; No point to complain here in case of error because we ;; should do basic block pruning in order to be sure that this @@ -2265,12 +2265,12 @@ Forward propagate immediate involed in assignments." (`(,(or 'call 'callref) ,f . ,args) (setf (comp-mvar-type lval) (alist-get f comp-known-ret-types)) - (comp-function-call-maybe-remove insn f args)) + (comp-function-call-maybe-fold insn f args)) (`(,(or 'direct-call 'direct-callref) ,f . ,args) (let ((f (comp-func-name (gethash f (comp-ctxt-funcs-h comp-ctxt))))) (setf (comp-mvar-type lval) (alist-get f comp-known-ret-types)) - (comp-function-call-maybe-remove insn f args))) + (comp-function-call-maybe-fold insn f args))) (_ (comp-mvar-propagate lval rval)))) (`(assume ,lval ,rval ,kind) -- 2.39.5