1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RJIT: Fix the argument for defined

Browse Source
This commit is contained in:
Takashi Kokubun 2023-04-04 00:40:31 -07:00
parent 19506650ef
commit 98f0e2c330
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ruby_vm/rjit/insn_compiler.rb
View File

@ -1283,7 +1283,7 @@ module RubyVM::RJIT
asm.cmovnz(:rax, :rcx) asm.cmovnz(:rax, :rcx)
# Push the return value onto the stack # Push the return value onto the stack
out_type = if C::SPECIAL_CONST_P(C.to_ruby(pushval)) out_type = if C::SPECIAL_CONST_P(pushval)
Type::UnknownImm Type::UnknownImm
else else
Type::Unknown Type::Unknown
@ -1307,7 +1307,7 @@ module RubyVM::RJIT
ivar_name = jit.operand(0) ivar_name = jit.operand(0)
# Value that will be pushed on the stack if the ivar is defined. In practice this is always the # Value that will be pushed on the stack if the ivar is defined. In practice this is always the
# string "instance-variable". If the ivar is not defined, nil will be pushed instead. # string "instance-variable". If the ivar is not defined, nil will be pushed instead.
pushval = jit.operand(2) pushval = jit.operand(2, ruby: true)
# Get the receiver # Get the receiver
recv = :rcx recv = :rcx
@ -1333,11 +1333,11 @@ module RubyVM::RJIT
# } # }
asm.test(C_RET, 255) asm.test(C_RET, 255)
asm.mov(:rax, Qnil) asm.mov(:rax, Qnil)
asm.mov(:rcx, pushval) asm.mov(:rcx, to_value(pushval))
asm.cmovnz(:rax, :rcx) asm.cmovnz(:rax, :rcx)
# Push the return value onto the stack # Push the return value onto the stack
out_type = C::SPECIAL_CONST_P(C.to_ruby(pushval)) ? Type::UnknownImm : Type::Unknown out_type = C::SPECIAL_CONST_P(pushval) ? Type::UnknownImm : Type::Unknown
stack_ret = ctx.stack_push(out_type) stack_ret = ctx.stack_push(out_type)
asm.mov(stack_ret, :rax) asm.mov(stack_ret, :rax)
@ -1358,7 +1358,7 @@ module RubyVM::RJIT
asm.cmp(shape_opnd, shape_id) asm.cmp(shape_opnd, shape_id)
jit_chain_guard(:jne, jit, ctx, asm, side_exit) jit_chain_guard(:jne, jit, ctx, asm, side_exit)
result = ivar_exists ? pushval : Qnil result = ivar_exists ? C.to_value(pushval) : Qnil
putobject(jit, ctx, asm, val: result) putobject(jit, ctx, asm, val: result)
# Jump to next instruction. This allows guard chains to share the same successor. # Jump to next instruction. This allows guard chains to share the same successor.