From: Andrea Corallo <akrl@sdf.org>
Date: Tue, 28 Dec 2021 11:12:16 +0000 (+0100)
Subject: * Fix native comp for non trivial function names (bug#52833)
X-Git-Tag: emacs-28.0.92~95
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e64aeff40;p=emacs.git

* Fix native comp for non trivial function names (bug#52833)

* lisp/emacs-lisp/comp.el (comp-c-func-name): Fix native compilation
for functions with function names containing non trivial
characters (bug#52833).

This commit is the backport of e7699bf290.

Do not merge to master
---

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 2ced6277add..a363bed3642 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -1181,7 +1181,9 @@ clashes."
 	                   for i across orig-name
 	                   for byte = (format "%x" i)
 	                   do (aset str j (aref byte 0))
-	                      (aset str (1+ j) (aref byte 1))
+			      (aset str (1+ j) (if (length> byte 1)
+						   (aref byte 1)
+						 ?\_))
 	                   finally return str))
          (human-readable (string-replace
                           "-" "_" orig-name))