nativecomp: optimize local CU calls at speed 2scratch/better-comp

* etc/NEWS: Document speed-2 local call optimization.
* etc/TODO: Remove completed item.
* lisp/emacs-lisp/comp.el
(comp--cu-local-func-c-name-v): New function.
(comp--call-optim-form-call): Enable named local direct calls
at speed 2.
(comp--function-trampoline-form): New helper.
(comp-trampoline-compile, comp-local-function-trampoline-compile):
Share trampoline generation.
* lisp/emacs-lisp/comp-run.el
(comp-local-function-trampoline--install-now): New function.
(comp-local-function-trampoline-install): Install local trampolines.
Defer trampoline compilation until after load.
* src/comp.c (emit_call, emit_ctxt_code, compile_function)
(load_comp_unit, unload_comp_unit): Add local function relocation
support.
(native_comp_local_function_p): New function.
(comp--install-local-function-trampoline): New subr.
(syms_of_comp): Register it and update trampoline docs.
* src/comp.h (Lisp_Native_Comp_Unit): Add local relocation slot.
(native_comp_local_function_p): Declare.
* src/data.c (Ffset): Install local trampolines for redefined
named local native functions.  Keep skipping anonymous lambdas.
* src/pdumper.c: Clear local relocation state.
* test/src/comp-tests.el
(comp-tests--run-in-sub-emacs): New helper.
(comp-tests--direct-call-redefinition-form): New helper.
(comp-tests-direct-call-redefinition-speed-split): New test.
(comp-tests-anonymous-lambda-recompile): New test.
(comp-tests-direct-call-with-lambdas): Use an explicit output file.

1 files changed, 17 insertions, 3 deletions

diff --git a/src/data.c b/src/data.c
index 4973d577c1c..2360033bb6b 100644
--- a/src/data.c
+++ b/src/data.c
@@ -912,10 +912,24 @@ signal a `cyclic-function-indirection' error.  */)
   register Lisp_Object function = XSYMBOL (symbol)->u.s.function;
 
   if (!NILP (Vnative_comp_enable_subr_trampolines)
-      && SUBRP (function)
-      && !NATIVE_COMP_FUNCTIONP (function)
       && !EQ (definition, Fsymbol_function (symbol)))
-     calln (Qcomp_subr_trampoline_install, symbol);
+    {
+      if (SUBRP (function) && !NATIVE_COMP_FUNCTIONP (function))
+        calln (Qcomp_subr_trampoline_install, symbol);
+      else if (NATIVE_COMP_FUNCTIONP (function))
+        {
+          if (!EQ (symbol, intern_c_string ("--anonymous-lambda"))
+              && native_comp_local_function_p (function)
+              && !(NATIVE_COMP_FUNCTIONP (definition)
+                   && EQ (Fsubr_native_comp_unit (function),
+                          Fsubr_native_comp_unit (definition))))
+            {
+              calln (intern_c_string ("require"), intern_c_string ("comp-run"));
+              calln (intern_c_string ("comp-local-function-trampoline-install"),
+                     symbol, function);
+            }
+        }
+    }
 #endif
 
   set_symbol_function (symbol, definition);