From 96d29dff66a0d2e045d09ce6bb7bb3b382c59c2c Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sun, 13 Nov 2022 21:14:46 -0800 Subject: Fix invokebuiltin in Ruby MJIT https://github.com/ruby/ruby/blob/45fe7f757522ed7d1d3ec754da59d41d45dd6bab/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb#L21 has not been ported correctly. --- lib/mjit/compiler.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/mjit/compiler.rb b/lib/mjit/compiler.rb index 9e6ea0a119..db8327b863 100644 --- a/lib/mjit/compiler.rb +++ b/lib/mjit/compiler.rb @@ -446,9 +446,10 @@ module RubyVM::MJIT def compile_invokebuiltin(f, insn, stack_size, sp_inc, body, operands) bf = C.RB_BUILTIN.new(operands[0]) if bf.compiler > 0 + index = (insn.name == :invokebuiltin ? -1 : operands[1]) C.fprintf(f, "{\n") C.fprintf(f, " VALUE val;\n") - C.builtin_compiler(f, bf, operands[1], stack_size, body.builtin_inline_p) + C.builtin_compiler(f, bf, index, stack_size, body.builtin_inline_p) C.fprintf(f, " stack[#{stack_size + sp_inc - 1}] = val;\n") C.fprintf(f, "}\n") return true -- cgit v1.2.3