1 files changed, 3 insertions, 2 deletions
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))
+      && !NATIVE_COMP_FUNCTIONP (function)
-    calln (Qcomp_subr_trampoline_install, symbol);
+      && !EQ (definition, Fsymbol_function (symbol)))
+     calln (Qcomp_subr_trampoline_install, symbol);
 #endif
  set_symbol_function (symbol, definition);

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. */)
904		904
905	if (!NILP (Vnative_comp_enable_subr_trampolines)	905	if (!NILP (Vnative_comp_enable_subr_trampolines)
906	&& SUBRP (function)	906	&& SUBRP (function)
907	&& !NATIVE_COMP_FUNCTIONP (function))	907	&& !NATIVE_COMP_FUNCTIONP (function)
908	calln (Qcomp_subr_trampoline_install, symbol);	908	&& !EQ (definition, Fsymbol_function (symbol)))
		909	calln (Qcomp_subr_trampoline_install, symbol);
909	#endif	910	#endif
910		911
911	set_symbol_function (symbol, definition);	912	set_symbol_function (symbol, definition);