From: Andrea Corallo <akrl@sdf.org>
Date: Mon, 6 Apr 2020 19:03:34 +0000 (+0100)
Subject: * lisp/emacs-lisp/comp.el (comp-c-func-name): Fix for M-x disassemble
X-Git-Tag: emacs-28.0.90~2727^2~719
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=32a079aef290fdc8913c1ce4e8910e63e6ff6dcc;p=emacs.git

* lisp/emacs-lisp/comp.el (comp-c-func-name): Fix for M-x disassemble
---

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 3f4dba6b1ff..9dc775bb6ac 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -474,14 +474,18 @@ Put PREFIX in front of it."
                           "-" "_" orig-name))
          (human-readable (replace-regexp-in-string
                           (rx (not (any "0-9a-z_"))) "" human-readable)))
-    ;; Prevent C namespace conflicts.
-    (cl-loop
-     with h = (comp-ctxt-funcs-h comp-ctxt)
-     for i from 0
-     for c-sym = (concat prefix crypted "_" human-readable "_"
-                        (number-to-string i))
-     unless (gethash c-sym h)
-       return c-sym)))
+    (if comp-ctxt
+        ;; Prevent C namespace conflicts.
+        (cl-loop
+         with h = (comp-ctxt-funcs-h comp-ctxt)
+         for i from 0
+         for c-sym = (concat prefix crypted "_" human-readable "_"
+                             (number-to-string i))
+         unless (gethash c-sym h)
+         return c-sym)
+      ;; When called out of a compilation context (ex disassembling)
+      ;; pick the first one.
+      (concat prefix crypted "_" human-readable "_0"))))
 
 (defun comp-decrypt-arg-list (x function-name)
   "Decript argument list X for FUNCTION-NAME."