From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Michael Heerdegen Newsgroups: gmane.emacs.bugs Subject: bug#38195: 27.0.50; `edebug-remove-instrumentation' doesn't work for adviced functions Date: Thu, 21 Nov 2019 12:49:26 +0100 Message-ID: <877e3t78l5.fsf@web.de> References: <87mucz98y9.fsf@web.de> <87r22brq3b.fsf@gnus.org> <87eeya9z3z.fsf@web.de> <87imnm4315.fsf@web.de> <87eey9z1mr.fsf@web.de> <87o8xaoe6j.fsf@web.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="111984"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: Lars Ingebrigtsen , 38195@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Nov 21 12:50:41 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iXkyv-000SyY-6D for geb-bug-gnu-emacs@m.gmane.org; Thu, 21 Nov 2019 12:50:41 +0100 Original-Received: from localhost ([::1]:39238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXkyt-0006gx-TV for geb-bug-gnu-emacs@m.gmane.org; Thu, 21 Nov 2019 06:50:40 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33626) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXkyS-0006gl-Gx for bug-gnu-emacs@gnu.org; Thu, 21 Nov 2019 06:50:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXkyR-0000Hs-B6 for bug-gnu-emacs@gnu.org; Thu, 21 Nov 2019 06:50:12 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42593) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iXkyR-0000HQ-2Z for bug-gnu-emacs@gnu.org; Thu, 21 Nov 2019 06:50:11 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iXkyL-0006Mm-8P for bug-gnu-emacs@gnu.org; Thu, 21 Nov 2019 06:50:05 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Michael Heerdegen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 21 Nov 2019 11:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38195 X-GNU-PR-Package: emacs Original-Received: via spool by 38195-submit@debbugs.gnu.org id=B38195.157433699124442 (code B ref 38195); Thu, 21 Nov 2019 11:50:02 +0000 Original-Received: (at 38195) by debbugs.gnu.org; 21 Nov 2019 11:49:51 +0000 Original-Received: from localhost ([127.0.0.1]:51413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXky4-0006M7-Ho for submit@debbugs.gnu.org; Thu, 21 Nov 2019 06:49:48 -0500 Original-Received: from mout.web.de ([212.227.17.11]:45559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXkxy-0006Lh-RR for 38195@debbugs.gnu.org; Thu, 21 Nov 2019 06:49:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1574336968; bh=vwbXY5nKM1vROXOWpy6XUQjjD2cjh+ZJz39OCmDBb8o=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=p02wds4xeGJtWgC/9hnLvBk+o7eNod0g+c8eMLwtcsFI0G+jQb6B97DgIgYJzMt5a Ov7zFkSnps1e7/lerTX5Ja7b1d5fpYfxucADz0X0uu4f1xPKfkeFPdGBcoq0qEIbx8 GWdlzgeqma14XqvXGyfLA+0NjGKQxhwlcku8Glxo= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Original-Received: from drachen.dragon ([94.218.222.9]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Lrs70-1hqLBu2AWM-013f7S; Thu, 21 Nov 2019 12:49:28 +0100 In-Reply-To: (Stefan Monnier's message of "Sun, 17 Nov 2019 11:04:34 -0500") X-Provags-ID: V03:K1:xj7AKMOcOx1iVmqNlYhqDfu+Qwfh4/J3XxmGawkgU3zdfHIaaJP AGjmaFHEQKNokpT7SVtt9MfgSv5a+DtScWWTd7OdgNoIjBC2EqFwosEfxOkYvU6Vi7+S3+C Lb1uRLP4iO2Q0NR630oYn2K2MqFA0hXtVf+H2HHiYfp5vA5nsnHa/DjEC+WJHUWi6gd1SNA AD/hBELRbKSrZuetKZsBQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:TVcbxcgagsc=:V0hugtTYa0kQqw4vDHQsxy Ycw5oVu9V65Nx2BUN90YvfV6x55GW1fiq6VYHb+gXF8GiTAATrbo2M9hORqNYBNfrS50z4KY8 vWuLofC9Dn78PnUshpvygr3wXZN5JdinVyIDWOY2CjJ/Fx8UOagh8RcYI+Lfp32vY1NbuhzHo CcSwLchq5xx/l29LfSjuXip5CnUc1JUIYfdr7FAmJT/GCltJjKgEoLzbdYspPoZga4ObpTwnd icOYy7blJhqTvJoDCeH/zyyHWt+HU+q290RFnWrPIsJ4uzVGFgi/CaOROHS+F2bYHAPDhXqeC 1OCHFbAtYjhoVy4G8URH3VYtye2c3Q8+nM2RusEc7NE707PBayJBxhdUGyeUxcDDhl96KQxoV OFSmLdGUU50vMiuXceNO7wbCyja8x7SbxkP+EbKYATYB3g6dsRBkdozFipuGqrmRWys5Ibfzs iRpCHqKzdOuNA3D/a75ic2I8l2AhjXSSYx7zyLWaHfI4mYtTBcyOV8r84OMyN6tseiSeUpe7U /lBYqaQkrfS0lNC854URIQW/20b3K1fHO/ogFQzdJpBPnpiXwBt4x6kHoN5CNoHIn4HCd865V dLPDCYnOz+QmksQ/vPRHB3zknCh9TQ5I7Dl8gGe6rRPrnsX75g0C+XrvRUumEXgCPrPdYbuJ0 K/piRfdpnTvhYXARHFHWShpY2hFJqleRh4AF7taI8tfyGOhjUfZoi416H5UsIZ/9lOfMLug6B XCig8CsM0PrRdfY1/PFLORuY97GVCHERYfR+DS4V9+akwTUbZQRWWFcRWmnsngQdB3poE/b+ 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: 209.51.188.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:172109 Archived-At: --=-=-= Content-Type: text/plain Stefan Monnier writes: > I don't think you need the `advice--p` here since `advice--cd*r` uses the > `*` meaning of regexps: "*zero* or more". Ok, removed. > > + ;; `defalias' takes care of any advises so we can just strip them > > Actually, you *have* to strip them (otherwise you'd end up copying them). Sure, I made that comment clearer. New patch: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-edebug-instrumentation-removing-from-advised-fun.patch Content-Transfer-Encoding: quoted-printable =46rom aab2cd47da230993e374d378c434989c98ce68ed Mon Sep 17 00:00:00 2001 From: Michael Heerdegen Date: Thu, 14 Nov 2019 17:47:51 +0100 Subject: [PATCH] Fix edebug instrumentation removing from advised function= s * lisp/emacs-lisp/edebug.el (edebug-remove-instrumentation): Handle advised functions correctly. =2D-- lisp/emacs-lisp/edebug.el | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 5d52704410..d68ed966f8 100644 =2D-- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -4571,6 +4571,21 @@ edebug-unload-function ;; Continue standard unloading. nil) +(defun edebug--unwrap*-symbol-function (symbol) + ;; Try to unwrap SYMBOL's `symbol-function'. The result is suitable + ;; to be fbound back to SYMBOL with `defalias'. When no unwrapping + ;; could be done return nil. + (pcase (symbol-function symbol) + ((or (and `(macro . ,f) (let was-macro t)) + (and f (let was-macro nil))) + ;; `defalias' takes care of advises so we must strip them + (let* ((orig-f (advice--cd*r f)) + (unwrapped (edebug-unwrap* orig-f))) + (cond + ((equal unwrapped orig-f) nil) + (was-macro `(macro . ,unwrapped)) + (t unwrapped)))))) + (defun edebug-remove-instrumentation (functions) "Remove Edebug instrumentation from FUNCTIONS. Interactively, the user is prompted for the function to remove @@ -4582,10 +4597,10 @@ edebug-remove-instrumentation (lambda (symbol) (when (and (get symbol 'edebug) (or (functionp symbol) - (macrop symbol))) - (let ((unwrapped (edebug-unwrap* (symbol-function symbol)))) - (unless (equal unwrapped (symbol-function symbol)) - (push symbol functions))))) + (macrop symbol)) + (edebug--unwrap*-symbol-function + symbol)) + (push symbol functions))) obarray) (unless functions (error "Found no functions to remove instrumentation from")) @@ -4599,8 +4614,9 @@ edebug-remove-instrumentation functions))))) ;; Remove instrumentation. (dolist (symbol functions) - (setf (symbol-function symbol) - (edebug-unwrap* (symbol-function symbol)))) + (when-let ((unwrapped + (edebug--unwrap*-symbol-function symbol))) + (defalias symbol unwrapped))) (message "Removed edebug instrumentation from %s" (mapconcat #'symbol-name functions ", "))) =2D- 2.24.0 --=-=-= Content-Type: text/plain Ok to install? BTW, I also wonder if we should enhance the command `edebug-remove-instrumentation' so that it is able to reload source files. It could look at the SYMOL's `symbol-file's, collect these, load the files, and only do what it does now for the symbols that are still wrapped. Could be controlled via prefix argument. Regards, Michael. --=-=-=--