From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#27016: possible bug in `defsetf' Date: Fri, 14 Jul 2017 00:32:34 -0400 Message-ID: References: <87h9075j12.fsf@users.sourceforge.net> <87injak1lj.fsf@users.sourceforge.net> <877ezp4v96.fsf@drachen> <871sppgyhb.fsf@users.sourceforge.net> <8760eyfp7s.fsf@users.sourceforge.net> <87a849djvp.fsf@users.sourceforge.net> <874lufets0.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1500006798 12195 195.159.176.226 (14 Jul 2017 04:33:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 14 Jul 2017 04:33:18 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: Michael Heerdegen , 27016@debbugs.gnu.org, Rafael D Sorkin To: npostavs@users.sourceforge.net Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jul 14 06:33:14 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dVsHy-0002sM-EL for geb-bug-gnu-emacs@m.gmane.org; Fri, 14 Jul 2017 06:33:14 +0200 Original-Received: from localhost ([::1]:35368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVsI2-0006RU-8d for geb-bug-gnu-emacs@m.gmane.org; Fri, 14 Jul 2017 00:33:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVsHp-0006Pb-IF for bug-gnu-emacs@gnu.org; Fri, 14 Jul 2017 00:33:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVsHm-0006dO-CX for bug-gnu-emacs@gnu.org; Fri, 14 Jul 2017 00:33:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVsHm-0006dE-8s for bug-gnu-emacs@gnu.org; Fri, 14 Jul 2017 00:33:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dVsHl-0006oR-Vw for bug-gnu-emacs@gnu.org; Fri, 14 Jul 2017 00:33:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Jul 2017 04:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27016 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 27016-submit@debbugs.gnu.org id=B27016.150000675726152 (code B ref 27016); Fri, 14 Jul 2017 04:33:01 +0000 Original-Received: (at 27016) by debbugs.gnu.org; 14 Jul 2017 04:32:37 +0000 Original-Received: from localhost ([127.0.0.1]:37593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dVsHN-0006nk-IZ for submit@debbugs.gnu.org; Fri, 14 Jul 2017 00:32:37 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:40851) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dVsHM-0006nc-3n for 27016@debbugs.gnu.org; Fri, 14 Jul 2017 00:32:36 -0400 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id v6E4WYLj003734; Fri, 14 Jul 2017 00:32:34 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 24143660B0; Fri, 14 Jul 2017 00:32:34 -0400 (EDT) In-Reply-To: (Stefan Monnier's message of "Thu, 13 Jul 2017 23:48:16 -0400") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 2 Rules triggered EDT_SA_DN_PASS=0, RV6071=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6071> : inlines <5978> : streams <1754100> : uri <2462463> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:134526 Archived-At: > I'm not sure yet how best way to solve this. I believe the patch below does the right thing. It's kind of a bummer that we have to byte-compile the function call by hand, tho. I tested it only lightly, so please give it a more thorough testing and then feel free to push it. Stefan diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index e5b9b47b1d..e6f90e044b 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -498,6 +498,10 @@ byte-compile-macro-environment Each element looks like (MACRONAME . DEFINITION). It is \(MACRONAME . nil) when a macro is redefined as a function.") +(defvar byte-compile-plist-environment nil + "Alist of property lists defined in the file being compiled. +Each element looks like (SYMBOL . PLIST).") + (defvar byte-compile-function-environment nil "Alist of functions defined in the file being compiled. This is so we can inline them when necessary. @@ -1585,6 +1589,7 @@ byte-compile-close-variables ;; macroenvironment. (copy-alist byte-compile-initial-macro-environment)) (byte-compile--outbuffer nil) + (byte-compile-plist-environment nil) (byte-compile-function-environment nil) (byte-compile-bound-variables nil) (byte-compile-lexical-variables nil) @@ -4695,7 +4700,7 @@ byte-compile-file-form-defalias (if (null fun) (message "Macro %s unrecognized, won't work in file" name) (message "Macro %s partly recognized, trying our luck" name) - (push (cons name (eval fun)) + (push (cons name (eval fun t)) byte-compile-macro-environment))) (byte-compile-keep-pending form)))) @@ -4725,6 +4730,33 @@ byte-compile-make-variable-buffer-local 'byte-hunk-handler 'byte-compile-form-make-variable-buffer-local) (defun byte-compile-form-make-variable-buffer-local (form) (byte-compile-keep-pending form 'byte-compile-normal-call)) + +(put 'function-put 'byte-hunk-handler 'byte-compile-function-put) +(defun byte-compile-function-put (form) + (pcase form + ((and `(,op ,fun ,prop ,val) + (guard (and (macroexp-const-p fun) + (macroexp-const-p prop) + (or (macroexp-const-p val) + ;; Also accept anonymous functions, since + ;; we're at top-level which implies they're + ;; also constants. + (pcase val (`(function (lambda . ,_)) t)))))) + (byte-compile-push-constant op) + (byte-compile-form fun) + (byte-compile-form prop) + (let* ((fun (eval fun t)) + (prop (eval prop t)) + (val (if (macroexp-const-p val) + (eval val t) + (byte-compile-lambda (cadr val))))) + (push (cons fun `(,prop ,val + . ,(assq fun byte-compile-plist-environment))) + byte-compile-plist-environment) + (byte-compile-push-constant val) + (byte-compile-out 'byte-call 3))) + + (_ (byte-compile-keep-pending form)))) ;;; tags