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: Sun, 17 Nov 2019 13:55:16 +0100 Message-ID: <87o8xaoe6j.fsf@web.de> References: <87mucz98y9.fsf@web.de> <87r22brq3b.fsf@gnus.org> <87eeya9z3z.fsf@web.de> <87imnm4315.fsf@web.de> <87eey9z1mr.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="18785"; 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 Sun Nov 17 13:56:30 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 1iWK6Q-0004kq-AM for geb-bug-gnu-emacs@m.gmane.org; Sun, 17 Nov 2019 13:56:30 +0100 Original-Received: from localhost ([::1]:53498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWK6O-0004kG-06 for geb-bug-gnu-emacs@m.gmane.org; Sun, 17 Nov 2019 07:56:28 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45754) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWK60-0004ho-1R for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2019 07:56:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWK5y-0005FL-TQ for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2019 07:56:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:59859) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iWK5y-0005F1-IO for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2019 07:56:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iWK5y-00050M-Dz for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2019 07:56:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Michael Heerdegen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 17 Nov 2019 12:56: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.157399533119202 (code B ref 38195); Sun, 17 Nov 2019 12:56:02 +0000 Original-Received: (at 38195) by debbugs.gnu.org; 17 Nov 2019 12:55:31 +0000 Original-Received: from localhost ([127.0.0.1]:40447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iWK5S-0004ze-O7 for submit@debbugs.gnu.org; Sun, 17 Nov 2019 07:55:31 -0500 Original-Received: from mout.web.de ([212.227.17.12]:40861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iWK5R-0004zR-D6 for 38195@debbugs.gnu.org; Sun, 17 Nov 2019 07:55:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1573995317; bh=YuLMjX6oQexSZ0TCYXEemh6gAnHLEAh9wDXdodLR3C8=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=Au077k/+SojMmnWmqD0D6852ONgEywItD6UBMwZTJ+akmXR8QfVXgjjvf2YPxxVBE qYyMSsXPWk+0RJl9fMpLDIw/FekW8TpEDaOysuPW1gM+8n0A0/Lb0WzbA2+FQWEQS1 +STVlV21WlWSpKF3vxXQTJlii9g4CRZ3DT33J9d0= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Original-Received: from drachen.dragon ([94.218.222.9]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LnBDd-1hvuvo2cw9-00hJu6; Sun, 17 Nov 2019 13:55:17 +0100 In-Reply-To: <87eey9z1mr.fsf@web.de> (Michael Heerdegen's message of "Fri, 15 Nov 2019 14:54:04 +0100") X-Provags-ID: V03:K1:/qfjcafOTOdi+UNIBKWBXR8R0rukmzhkV6Vzom6Gp7F/PHQTsWm GHMqgcNNl1FLCUiBSO+hTLe1xJnShy2kNT12UxxWlpo8M0/NDE0vQrEY508mh3toGQkm4js Y3SwTSSDEgZ/PsZInrLhJn26EvfP6lMxiGm/JHiUQnhrGMVmmvCLL/BZ4FuEWD2qWMlWzGm m7pgo1JkiHGQUquI8L+Xw== X-UI-Out-Filterresults: notjunk:1;V03:K0:aqSfGDMyFko=:U8SFrqM4Fh+Rdd7ioNP4NM JAYA1qUMAHhiFkQQZx8CPLcerRWGiDwniK88/CuVuzO8IksINjmwA6QVlyF4Po48gZ+TDy2/d axasNLSNKK6i0FqtJNywJKC88NGHWB+1LC7XQ9Hq6/bhvakawnMKbu5QJ+kGEA0E/xDwjSk60 gRXYFx/YtKMO+6GXb+LmNkOGX157AsL2NESHuUH48JK0eRrA1FY/gD21Pfo6nD9KjlVS+AVXv nL/7e/b4IRFOZBW69WLkMRSKJQp/kkhvJkpw2h5Ko8lWkluhnJQ0lHHISPovaiJhUsFqmsdwl qYm8ynhd2Z+rOKgiBOBl5/f43qc52IMDi6iS6HHhvY6HMi8crU+QPRxFUfp35YXS57UGm5pJK wAvDplTnVrNIBaUtNbwJP0J30ycAaDuwwVNhqN6OyBxtW9AURslS0KF3fm1mcGguvozX5yNNa Eb7XtqB4byxcbHq+50KPPEMoeuztORSrIcY3wX2kHs84j3mRtCFNplMBJYW1KbfmWcmhc/D3Q 82DdWHv0YihzhmdMrFFP3aQMQaeS6CdWUbNCrrvaisUGVWrZDCKzRZmXn6R6t3Rgs+t6VLqqg zeHMic+ax2wrUD+kQQD46LIxTYnWlkdHjN3YI25vc9fy5zE+b47cj11eluLYBvtxEw1R6wPkV LMT0a62uCMG8K5rUeQl7ErHBsPYtPpwvdS1ac/yo48qp6kGmcb++wDP0WaKh3VR8bLIIirMHK qun8nMNov6TsmtczX6lMTWlqdvF+7mGO7+c5ZbtsdgyA2O0YvoA7CDfp61CBdRtMNGs68ktw 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:171799 Archived-At: --=-=-= Content-Type: text/plain Michael Heerdegen writes: > Hello again, > > I'm preparing a new patch with less quirks. New patch: not much different but hopefully better understandable now. I also added a comment about why we are allowed to just strip advises. Also did some testing - seems to work ok. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-WIP-Try-to-fix-edebug-remove-instrumentation-for-adv.patch Content-Transfer-Encoding: quoted-printable =46rom 29380dcd30523e057d8fd45106f1d077e4212198 Mon Sep 17 00:00:00 2001 From: Michael Heerdegen Date: Thu, 14 Nov 2019 17:47:51 +0100 Subject: [PATCH] WIP: Try to fix edebug-remove-instrumentation for advised funs =2D-- lisp/emacs-lisp/edebug.el | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 5d52704410..e0fcdf0f86 100644 =2D-- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -4571,6 +4571,23 @@ 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 to SYMBOL with `defalias'. When no unwrapping could + ;; be done return nil. + (pcase (symbol-function symbol) + ((or (and `(macro . ,(and (pred advice--p) ad)) (let was-macro t)) + (and (pred advice--p) ad (let was-macro nil))) + ;; `defalias' takes care of any advises so we can just strip them + (let* ((orig-f (advice--cd*r ad)) + (unwrapped (edebug-unwrap* orig-f))) + (cond + ((equal unwrapped orig-f) nil) + (was-macro `(macro . ,unwrapped)) + (t unwrapped)))) + (sym-fun (let ((unwrapped (edebug-unwrap* sym-fun))) + (if (equal sym-fun unwrapped) nil unwrapped))))) + (defun edebug-remove-instrumentation (functions) "Remove Edebug instrumentation from FUNCTIONS. Interactively, the user is prompted for the function to remove @@ -4582,10 +4599,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 +4616,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 Thanks, Michael. --=-=-=--