From 72e51343124181539cb356104516eb3708d40d1a Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 20 Jun 2024 15:59:57 +0200 Subject: [PATCH] Fix misspelled function name in comp.c * src/comp.c (retrieve_block): Rename from 'retrive_block'. Update all callers. (cherry picked from commit 6c85b0311127332621e79217e7a208b679c89d5a) --- src/comp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/comp.c b/src/comp.c index 9ebb2f7fed6..df7fa3a5199 100644 --- a/src/comp.c +++ b/src/comp.c @@ -878,7 +878,7 @@ bcall0 (Lisp_Object f) } static gcc_jit_block * -retrive_block (Lisp_Object block_name) +retrieve_block (Lisp_Object block_name) { Lisp_Object value = Fgethash (block_name, comp.func_blocks_h, Qnil); @@ -2298,7 +2298,7 @@ emit_limple_insn (Lisp_Object insn) if (EQ (op, Qjump)) { /* Unconditional branch. */ - gcc_jit_block *target = retrive_block (arg[0]); + gcc_jit_block *target = retrieve_block (arg[0]); gcc_jit_block_end_with_jump (comp.block, NULL, target); } else if (EQ (op, Qcond_jump)) @@ -2306,8 +2306,8 @@ emit_limple_insn (Lisp_Object insn) /* Conditional branch. */ gcc_jit_rvalue *a = emit_mvar_rval (arg[0]); gcc_jit_rvalue *b = emit_mvar_rval (arg[1]); - gcc_jit_block *target1 = retrive_block (arg[2]); - gcc_jit_block *target2 = retrive_block (arg[3]); + gcc_jit_block *target1 = retrieve_block (arg[2]); + gcc_jit_block *target2 = retrieve_block (arg[3]); if ((!NILP (CALL1I (comp-cstr-imm-vld-p, arg[0])) && NILP (CALL1I (comp-cstr-imm, arg[0]))) @@ -2330,8 +2330,8 @@ emit_limple_insn (Lisp_Object insn) gcc_jit_context_new_rvalue_from_int (comp.ctxt, comp.ptrdiff_type, XFIXNUM (arg[0])); - gcc_jit_block *target1 = retrive_block (arg[1]); - gcc_jit_block *target2 = retrive_block (arg[2]); + gcc_jit_block *target1 = retrieve_block (arg[1]); + gcc_jit_block *target2 = retrieve_block (arg[2]); gcc_jit_rvalue *test = gcc_jit_context_new_comparison ( comp.ctxt, NULL, @@ -2360,8 +2360,8 @@ emit_limple_insn (Lisp_Object insn) gcc_jit_context_new_rvalue_from_int (comp.ctxt, comp.int_type, h_num); - gcc_jit_block *handler_bb = retrive_block (arg[2]); - gcc_jit_block *guarded_bb = retrive_block (arg[3]); + gcc_jit_block *handler_bb = retrieve_block (arg[2]); + gcc_jit_block *guarded_bb = retrieve_block (arg[3]); emit_limple_push_handler (handler, handler_type, handler_bb, guarded_bb, arg[0]); } @@ -4346,7 +4346,7 @@ compile_function (Lisp_Object func) declare_block (block_name); } - gcc_jit_block_add_assignment (retrive_block (Qentry), + gcc_jit_block_add_assignment (retrieve_block (Qentry), NULL, comp.func_relocs_local, gcc_jit_lvalue_as_rvalue (comp.func_relocs)); @@ -4361,7 +4361,7 @@ compile_function (Lisp_Object func) xsignal1 (Qnative_ice, build_string ("basic block is missing or empty")); - comp.block = retrive_block (block_name); + comp.block = retrieve_block (block_name); while (CONSP (insns)) { Lisp_Object insn = XCAR (insns); -- 2.39.2