diff options
| author | Andrea Corallo | 2020-04-26 09:11:33 +0100 |
|---|---|---|
| committer | Andrea Corallo | 2020-04-26 10:10:17 +0100 |
| commit | bb4cf13c47a1a24ce83233cc7b77dc87fc274d52 (patch) | |
| tree | 2ae6445e1d524a04d1103171f0086883a5d96813 /src/comp.c | |
| parent | 2878624980a116550e8b07acc76a24c373eab342 (diff) | |
| download | emacs-bb4cf13c47a1a24ce83233cc7b77dc87fc274d52.tar.gz emacs-bb4cf13c47a1a24ce83233cc7b77dc87fc274d52.zip | |
Convert before final function doc hash into a vector.
* lisp/emacs-lisp/comp.el (comp-finalize-relocs): Convert doc hash
table into vector befor final.
(comp-emit-for-top-level): Rename `comp-ctxt-doc-index-h' ->
`comp-ctxt-function-docs'.
(comp-ctxt): Likewise.
* src/comp.c (native_function_doc): Update logic for documentation
being a vector.
(emit_ctxt_code): Update for 'comp-ctxt-doc-index-h' slot rename.
* src/comp.h (struct Lisp_Native_Comp_Unit): Rename 'data_fdoc_h'
into data_fdoc_v.
* src/pdumper.c (dump_native_comp_unit): Likewise.
Diffstat (limited to 'src/comp.c')
| -rw-r--r-- | src/comp.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/comp.c b/src/comp.c index b33ef92f72b..d021be479b0 100644 --- a/src/comp.c +++ b/src/comp.c | |||
| @@ -2102,7 +2102,7 @@ emit_ctxt_code (void) | |||
| 2102 | emit_static_object (TEXT_OPTIM_QLY_SYM, Flist (2, opt_qly)); | 2102 | emit_static_object (TEXT_OPTIM_QLY_SYM, Flist (2, opt_qly)); |
| 2103 | 2103 | ||
| 2104 | emit_static_object (TEXT_FDOC_SYM, | 2104 | emit_static_object (TEXT_FDOC_SYM, |
| 2105 | CALL1I (comp-ctxt-doc-index-h, Vcomp_ctxt)); | 2105 | CALL1I (comp-ctxt-function-docs, Vcomp_ctxt)); |
| 2106 | 2106 | ||
| 2107 | comp.current_thread_ref = | 2107 | comp.current_thread_ref = |
| 2108 | gcc_jit_lvalue_as_rvalue ( | 2108 | gcc_jit_lvalue_as_rvalue ( |
| @@ -3677,14 +3677,12 @@ native_function_doc (Lisp_Object function) | |||
| 3677 | struct Lisp_Native_Comp_Unit *cu = | 3677 | struct Lisp_Native_Comp_Unit *cu = |
| 3678 | XNATIVE_COMP_UNIT (Fsubr_native_comp_unit (function)); | 3678 | XNATIVE_COMP_UNIT (Fsubr_native_comp_unit (function)); |
| 3679 | 3679 | ||
| 3680 | if (NILP (cu->data_fdoc_h)) | 3680 | if (NILP (cu->data_fdoc_v)) |
| 3681 | cu->data_fdoc_h = load_static_obj (cu, TEXT_FDOC_SYM); | 3681 | cu->data_fdoc_v = load_static_obj (cu, TEXT_FDOC_SYM); |
| 3682 | 3682 | if (!VECTORP (cu->data_fdoc_v)) | |
| 3683 | eassert (!NILP (cu->data_fdoc_h)); | 3683 | xsignal2 (Qnative_lisp_file_inconsistent, cu->file, |
| 3684 | 3684 | build_string ("missing documentation vector")); | |
| 3685 | return Fgethash (make_fixnum (XSUBR (function)->doc), | 3685 | return AREF (cu->data_fdoc_v, XSUBR (function)->doc); |
| 3686 | cu->data_fdoc_h, | ||
| 3687 | Qnil); | ||
| 3688 | } | 3686 | } |
| 3689 | 3687 | ||
| 3690 | DEFUN ("comp--register-subr", Fcomp__register_subr, Scomp__register_subr, | 3688 | DEFUN ("comp--register-subr", Fcomp__register_subr, Scomp__register_subr, |