From: Michael Heerdegen <michael_heerdegen@web.de>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Lars Ingebrigtsen <larsi@gnus.org>, 38195@debbugs.gnu.org
Subject: bug#38195: 27.0.50; `edebug-remove-instrumentation' doesn't work for adviced functions
Date: Thu, 14 Nov 2019 17:55:28 +0100 [thread overview]
Message-ID: <87eeya9z3z.fsf@web.de> (raw)
In-Reply-To: <87r22brq3b.fsf@gnus.org> (Lars Ingebrigtsen's message of "Thu, 14 Nov 2019 06:20:40 +0100")
[-- Attachment #1: Type: text/plain, Size: 539 bytes --]
Lars Ingebrigtsen <larsi@gnus.org> writes:
> > e.g. (just a random example)
> >
> > (defun f (x) (* 2 (+ 1 x)))
> >
> > (advice-add 'f :around (lambda (orig-f x) (1+ (funcall orig-f x))))
> >
> > Instrument `f'. Then M-x edebug-remove-instrumentation gives
> >
> > "Found no functions to remove instrumentation from".
>
> This is due to edebug-unwrap* not actually unwrapping something if it
> has been advised, apparently... I'm not familiar enough with how edebug
> really works to fix that.
Stefan, does this patch make sense?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-WIP-Try-to-fix-edebug-remove-instrumentation-for-adv.patch --]
[-- Type: text/x-diff, Size: 3086 bytes --]
From c1c2cd4faa0adc87f9334ec92ace8bcf5ae8333e Mon Sep 17 00:00:00 2001
From: Michael Heerdegen <michael_heerdegen@web.de>
Date: Thu, 14 Nov 2019 17:47:51 +0100
Subject: [PATCH] WIP: Try to fix edebug-remove-instrumentation for advised
funs
---
lisp/emacs-lisp/edebug.el | 33 ++++++++++++++++++++++++++++-----
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 6b55d7cff0..e94adeb64b 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -56,6 +56,7 @@
(require 'macroexp)
(require 'cl-lib)
(eval-when-compile (require 'pcase))
+(eval-when-compile (require 'subr-x))
;;; Options
@@ -4571,6 +4572,20 @@ edebug-unload-function
;; Continue standard unloading.
nil)
+(defun edebug--advised-p (symbol)
+ ;; Non-nil when SYMBOL's `symbol-function' is advised. The non-nil
+ ;; return value is the unwrapped base function if it was wrapped,
+ ;; and the symbol t else.
+ (pcase (symbol-function symbol)
+ ((and (pred advice--p)
+ (app advice--cd*r orig-f)
+ (let unwrapped (edebug-unwrap* orig-f)))
+ (if (equal unwrapped orig-f) t unwrapped))
+ (`(macro . ,(and (pred advice--p)
+ (app advice--cd*r orig-f)
+ (let unwrapped (edebug-unwrap* orig-f))))
+ (if (equal unwrapped orig-f) t `(macro . ,unwrapped)))))
+
(defun edebug-remove-instrumentation (functions)
"Remove Edebug instrumentation from FUNCTIONS.
Interactively, the user is prompted for the function to remove
@@ -4582,9 +4597,13 @@ edebug-remove-instrumentation
(lambda (symbol)
(when (and (functionp symbol)
(get symbol 'edebug))
- (let ((unwrapped (edebug-unwrap* (symbol-function symbol))))
- (unless (equal unwrapped (symbol-function symbol))
- (push symbol functions)))))
+ (if-let ((advised (edebug--advised-p symbol)))
+ (unless (eq advised t)
+ (push symbol functions))
+ (let ((unwrapped (edebug-unwrap*
+ (symbol-function symbol))))
+ (unless (equal unwrapped (symbol-function symbol))
+ (push symbol functions))))))
obarray)
(unless functions
(error "Found no functions to remove instrumentation from"))
@@ -4598,8 +4617,12 @@ edebug-remove-instrumentation
functions)))))
;; Remove instrumentation.
(dolist (symbol functions)
- (setf (symbol-function symbol)
- (edebug-unwrap* (symbol-function symbol))))
+ (if-let ((advised (edebug--advised-p symbol)))
+ (unless (eq advised t)
+ (funcall (or (get symbol 'defalias-fset-function) #'fset)
+ symbol advised))
+ (setf (symbol-function symbol)
+ (edebug-unwrap* (symbol-function symbol)))))
(message "Removed edebug instrumentation from %s"
(mapconcat #'symbol-name functions ", ")))
--
2.24.0
[-- Attachment #3: Type: text/plain, Size: 242 bytes --]
I'm not sure if I should use `indirect-function' somewhere instead of
`symbol-function', but I also don't understand (and also didn't yet try
to find out) why nadvice doesn't use `indirect-function' for its
manipulations.
Thanks,
Michael.
next prev parent reply other threads:[~2019-11-14 16:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-13 13:55 bug#38195: 27.0.50; `edebug-remove-instrumentation' doesn't work for adviced functions Michael Heerdegen
2019-11-14 5:20 ` Lars Ingebrigtsen
2019-11-14 16:51 ` Michael Heerdegen
2019-11-14 22:39 ` Michael Heerdegen
2019-11-15 7:57 ` Lars Ingebrigtsen
2019-11-15 12:39 ` Michael Heerdegen
2019-11-16 4:28 ` Lars Ingebrigtsen
2019-11-16 12:25 ` Michael Heerdegen
2019-11-14 16:55 ` Michael Heerdegen [this message]
2019-11-14 19:08 ` Stefan Monnier
2019-11-14 20:27 ` Michael Heerdegen
2019-11-14 21:33 ` Stefan Monnier
2019-11-15 13:54 ` Michael Heerdegen
2019-11-15 17:30 ` Stefan Monnier
2019-11-17 12:35 ` Michael Heerdegen
2019-11-17 12:55 ` Michael Heerdegen
2019-11-17 16:04 ` Stefan Monnier
2019-11-21 11:49 ` Michael Heerdegen
2019-11-23 13:32 ` Michael Heerdegen
2019-11-26 21:01 ` Michael Heerdegen
2019-11-27 12:17 ` Lars Ingebrigtsen
2020-09-20 10:54 ` Lars Ingebrigtsen
2019-11-14 21:15 ` Michael Heerdegen
2019-11-15 8:03 ` Lars Ingebrigtsen
2019-11-15 12:11 ` Michael Heerdegen
2019-11-15 12:15 ` Lars Ingebrigtsen
2019-11-15 12:34 ` Michael Heerdegen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87eeya9z3z.fsf@web.de \
--to=michael_heerdegen@web.de \
--cc=38195@debbugs.gnu.org \
--cc=larsi@gnus.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).