summaryrefslogtreecommitdiff
path: root/lib/ruby_vm
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2023-04-04 23:36:24 -0700
committerTakashi Kokubun <takashikkbn@gmail.com>2023-04-04 23:42:14 -0700
commit4e9c3b4518822036ee7d60b9bf7e77ee6753b725 (patch)
tree4c9d3b5b9cae827a664a065ef69b1484c664d6bb /lib/ruby_vm
parent4f77d1cdb89c3650461552d98aa527dd7f48d5df (diff)
downloadruby-4e9c3b4518822036ee7d60b9bf7e77ee6753b725.tar.gz
RJIT: Eliminate known-result guards for blockarg
Diffstat (limited to 'lib/ruby_vm')
-rw-r--r--lib/ruby_vm/rjit/insn_compiler.rb14
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/ruby_vm/rjit/insn_compiler.rb b/lib/ruby_vm/rjit/insn_compiler.rb
index 4be090e462..d45a0374f4 100644
--- a/lib/ruby_vm/rjit/insn_compiler.rb
+++ b/lib/ruby_vm/rjit/insn_compiler.rb
@@ -4157,17 +4157,11 @@ module RubyVM::RJIT
# @param asm [RubyVM::RJIT::Assembler]
def guard_block_arg(jit, ctx, asm, calling)
if calling.flags & C::VM_CALL_ARGS_BLOCKARG != 0
- # TODO: Skip cmp + jne using Context
- block_code = jit.peek_at_stack(0)
- block_opnd = ctx.stack_opnd(0) # to be popped after eliminating side exit possibility
- if block_code.nil?
- asm.cmp(block_opnd, Qnil)
- jit_chain_guard(:jne, jit, ctx, asm, counted_exit(side_exit(jit, ctx), :send_block_not_nil))
+ block_arg_type = ctx.get_opnd_type(StackOpnd[0])
+ case block_arg_type
+ in Type::Nil
calling.block_handler = C::VM_BLOCK_HANDLER_NONE
- elsif C.to_value(block_code) == C.rb_block_param_proxy
- asm.mov(:rax, C.rb_block_param_proxy)
- asm.cmp(block_opnd, :rax)
- jit_chain_guard(:jne, jit, ctx, asm, counted_exit(side_exit(jit, ctx), :send_block_not_proxy))
+ in Type::BlockParamProxy
calling.block_handler = C.rb_block_param_proxy
else
asm.incr_counter(:send_block_arg)