diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index d833966844d..9784f0b1255 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -3561,7 +3561,7 @@ the deferred compilation mechanism."
                    for pass in comp-passes
                    unless (memq pass comp-disabled-passes)
                    do
-                   (comp-log (format "\n(%s) Running pass %s:\n"
+                   (comp-log (format "\n(%S) Running pass %s:\n"
                                      function-or-file pass)
                              2)
                    (setf data (funcall pass data))
@@ -3570,7 +3570,7 @@ the deferred compilation mechanism."
                             do (funcall f data))
                    finally
                    (when comp-log-time-report
-                     (comp-log (format "Done compiling %s" data) 0)
+                     (comp-log (format "Done compiling %S" data) 0)
                      (cl-loop for (pass . time) in (reverse report)
                               do (comp-log (format "Pass %s took: %fs."
                                                    pass time)
@@ -3582,7 +3582,7 @@ the deferred compilation mechanism."
                    (if (and comp-async-compilation
                             (not (eq (car err) 'native-compiler-error)))
                        (progn
-                         (message "%s: Error %s"
+                         (message "%S: Error %s"
                                   function-or-file
                                   (error-message-string err))
                          (kill-emacs -1))
diff --git a/src/data.c b/src/data.c
index 5d1c065e785..493a8dd63fc 100644
--- a/src/data.c
+++ b/src/data.c
@@ -904,8 +904,9 @@ signal a `cyclic-function-indirection' error.  */)
 
   if (!NILP (Vnative_comp_enable_subr_trampolines)
       && SUBRP (function)
-      && !NATIVE_COMP_FUNCTIONP (function))
-    calln (Qcomp_subr_trampoline_install, symbol);
+      && !NATIVE_COMP_FUNCTIONP (function)
+      && !EQ (definition, Fsymbol_function (symbol)))
+     calln (Qcomp_subr_trampoline_install, symbol);
 #endif
 
   set_symbol_function (symbol, definition);