bug#67005: 30.0.50; improve nadivce/comp/trampoline handling

[Andy Moreton <andrewjmoreton@gmail.com>]

On Mon 04 Dec 2023, Andrea Corallo wrote:

> Jens Schmidt <jschmidt4gnu@vodafonemail.de> writes:
>
>> Jens Schmidt <jschmidt4gnu@vodafonemail.de> writes:
>>
>>> Patch reworked accordingly, also to include the additional commit
>>> message Andreas has proposed.  Please review.
>>
>> 10 days (inclusive) have passed, so: Gentle Bump.  Is there anything
>> still missing here?
>>
>> Thanks                                                          Jens
>
> Hi Jens,
>
> I've installed your patch into master with e670412a3e1.
>
> I'm closing the bug as well, happy to re-poen if necessary.
>
> Thanks
>
>   Andrea

Commit e670412a3e10 ("Update handling of advices during preload")
appears to break bootstrap on Windows with the 64bit mingw64
toolchain:

Error: error ("Preload advice on insert-directory")
  mapbacktrace((closure ((prin1 . cl-prin1) t) (evald func args _flags) (let ((args args)) (if evald (progn (princ "  ") (funcall prin1 func) (princ "(")) (progn (princ "  (\b
") (setq args (cons func args)))) (if args (while (progn (funcall prin1 (car args)) (setq args (cdr args)))(princ " "))) (princ ")\n"))))
  (let ((print-escape-newlines t) (print-escape-control-characters t) (print-escape-nonascii t) (prin1 (if (and (fboundp 'cl-prin1) (fboundp 'cl-defmethod) (condition-case  \bn
il (require 'cl-print) (error nil))) #'cl-prin1 #'prin1))) (mapbacktrace #'(lambda (evald func args _flags) (let ((args args)) (if evald (progn (princ "  ") (funcall prin1 f\b
unc) (princ "(")) (progn (princ "  (") (setq args (cons func args)))) (if args (while (progn (funcall prin1 (car args)) (setq args (cdr args))) (princ " "))) (princ ")\n")))\b
))
  debug-early-backtrace()
debug-early(error (error "Preload advice on insert-directory"))
  signal(error ("Preload advice on insert-directory"))
  error("Preload advice on %s" insert-directory)
  (and (advice--p (symbol-function f)) (error "Preload advice on %s" f))
  (closure (t) (f) (and (advice--p (symbol-function f)) (error "Preload advice on %s" f)))(insert-directory)
  mapatoms((closure(t) (f) (and (advice--p (symbol-function f)) (error "Preload advice on %s" f))))
  load("loadup.el")
Preload advice on insert-directory
make[2]: *** [Makefile:1014: bootstrap-emacs.pdmp] Error 127
make[1]: *** [Makefile:554: src] Error 2

Bootstrapping the same config with commit f5e45247081a ("comp: Fix mvar
dependency chain (bug#67239)") succeeds.

Both builds done from a clean checkout after "git clean -xdf".

    AndyM