From a517f3d759cb0747482ee6572065c7cd9518faa5 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sun, 15 May 2022 15:37:12 +0200 Subject: [PATCH] Adjust more prin1-to-string callers * src/w32.c (check_windows_init_file): * src/comp.c (Lisp_Object): (emit_lisp_obj_reloc_lval): (emit_lisp_obj_rval): (emit_mvar_rval): (emit_limple_insn): (emit_static_object): Adjust prin1-to-string callers. --- src/comp.c | 12 ++++++------ src/w32.c | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/comp.c b/src/comp.c index 66a7ab789a8..b01106c906f 100644 --- a/src/comp.c +++ b/src/comp.c @@ -761,7 +761,7 @@ For internal use. */) (Lisp_Object subr) { return concat2 (Fsubr_name (subr), - Fprin1_to_string (Fsubr_arity (subr), Qnil)); + Fprin1_to_string (Fsubr_arity (subr), Qnil, Qnil)); } /* Produce a key hashing Vcomp_subr_list. */ @@ -1707,7 +1707,7 @@ static gcc_jit_lvalue * emit_lisp_obj_reloc_lval (Lisp_Object obj) { emit_comment (format_string ("l-value for lisp obj: %s", - SSDATA (Fprin1_to_string (obj, Qnil)))); + SSDATA (Fprin1_to_string (obj, Qnil, Qnil)))); imm_reloc_t reloc = obj_to_reloc (obj); return gcc_jit_context_new_array_access (comp.ctxt, @@ -1720,7 +1720,7 @@ static gcc_jit_rvalue * emit_lisp_obj_rval (Lisp_Object obj) { emit_comment (format_string ("const lisp obj: %s", - SSDATA (Fprin1_to_string (obj, Qnil)))); + SSDATA (Fprin1_to_string (obj, Qnil, Qnil)))); if (NILP (obj)) { @@ -1968,7 +1968,7 @@ emit_mvar_rval (Lisp_Object mvar) SSDATA ( Fprin1_to_string ( NILP (func) ? value : CALL1I (comp-func-c-name, func), - Qnil))); + Qnil, Qnil))); } if (FIXNUMP (value)) { @@ -2471,7 +2471,7 @@ emit_limple_insn (Lisp_Object insn) else if (EQ (op, Qsetimm)) { /* Ex: (setimm #s(comp-mvar 9 1 t 3 nil) a). */ - emit_comment (SSDATA (Fprin1_to_string (arg[1], Qnil))); + emit_comment (SSDATA (Fprin1_to_string (arg[1], Qnil, Qnil))); imm_reloc_t reloc = obj_to_reloc (arg[1]); emit_frame_assignment ( arg[0], @@ -2647,7 +2647,7 @@ emit_static_object (const char *name, Lisp_Object obj) specbind (intern_c_string ("print-quoted"), Qt); specbind (intern_c_string ("print-gensym"), Qt); specbind (intern_c_string ("print-circle"), Qt); - Lisp_Object str = Fprin1_to_string (obj, Qnil); + Lisp_Object str = Fprin1_to_string (obj, Qnil, Qnil); unbind_to (count, Qnil); ptrdiff_t len = SBYTES (str); diff --git a/src/w32.c b/src/w32.c index 1b10b9965fb..590d9e85d93 100644 --- a/src/w32.c +++ b/src/w32.c @@ -10297,7 +10297,8 @@ check_windows_init_file (void) openp (Vload_path, init_file, Fget_load_suffixes (), NULL, Qnil, 0, 0); if (fd < 0) { - Lisp_Object load_path_print = Fprin1_to_string (Vload_path, Qnil); + Lisp_Object load_path_print = Fprin1_to_string (Vload_path, + Qnil, Qnil); char *init_file_name = SSDATA (init_file); char *load_path = SSDATA (load_path_print); char *buffer = alloca (1024 -- 2.39.2