archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 05:29:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

YJIT: Fix defined?(yield) and block_given? at top level

Browse source 
Previously, YJIT returned truthy for the block given query at the top
level. That's incorrect because the top level script never receives a
block, and `yield` is a syntax error there.

Inside methods, the number of hops to get from `iseq` to
`iseq->body->local_iseq` is the same as the number of
`VM_ENV_PREV_EP(ep)` hops to get to an environment with
`VM_ENV_FLAG_LOCAL`. YJIT and the interpreter both rely on this as can
be seen in get_lvar_level(). However, this identity does not hold for
the top level frame because of vm_set_eval_stack(), which sets up
`TOPLEVEL_BINDING`.

Since only methods can take a block that `yield` goes to, have ISEQs
that are the child of a non-method ISEQ return falsy for the block given
query. This fixes the issue for the top level script and is an
optimization for non-method contexts such as inside `ISEQ_TYPE_CLASS`.
This commit is contained in:
Alan Wu 2025-08-13 12:39:06 -04:00
parent b080fcd3cd
commit 38558dd95e
2 changed files with 44 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
bootstraptest/test_yjit.rb
View file

@ -5342,3 +5342,30 @@ assert_equal 'nil', %{
test_local_fill_in_forwardable.inspect test_local_fill_in_forwardable.inspect
} }
# Test defined?(yield) and block_given? in non-method context.
# It's good that the body of this runs at true top level and isn't wrapped in a block.
assert_equal 'false', %{
RESULT = []
RESULT << defined?(yield)
RESULT << block_given?
1.times do
RESULT << defined?(yield)
RESULT << block_given?
end
module ModuleContext
1.times do
RESULT << defined?(yield)
RESULT << block_given?
end
end
class << self
RESULT << defined?(yield)
RESULT << block_given?
end
RESULT.any?
}

26
yjit/src/codegen.rs
View file

@ -6656,16 +6656,24 @@ fn gen_block_given(
) { ) {
asm_comment!(asm, "block_given?"); asm_comment!(asm, "block_given?");
// Same as rb_vm_frame_block_handler // `yield` goes to the block handler stowed in the "local" iseq which is
let ep_opnd = gen_get_lep(jit, asm); // the current iseq or a parent. Only the "method" iseq type can be passed a
let block_handler = asm.load( // block handler. (e.g. `yield` in the top level script is a syntax error.)
Opnd::mem(64, ep_opnd, SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_SPECVAL) let local_iseq = unsafe { rb_get_iseq_body_local_iseq(jit.iseq) };
); if unsafe { rb_get_iseq_body_type(local_iseq) } == ISEQ_TYPE_METHOD {
// Same as rb_vm_frame_block_handler
let ep_opnd = gen_get_lep(jit, asm);
let block_handler = asm.load(
Opnd::mem(64, ep_opnd, SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_SPECVAL)
);
// Return `block_handler != VM_BLOCK_HANDLER_NONE` // Return `block_handler != VM_BLOCK_HANDLER_NONE`
asm.cmp(block_handler, VM_BLOCK_HANDLER_NONE.into()); asm.cmp(block_handler, VM_BLOCK_HANDLER_NONE.into());
let block_given = asm.csel_ne(true_opnd, false_opnd); let block_given = asm.csel_ne(true_opnd, false_opnd);
asm.mov(out_opnd, block_given); asm.mov(out_opnd, block_given);
} else {
asm.mov(out_opnd, false_opnd);
}
} }
// Codegen for rb_class_superclass() // Codegen for rb_class_superclass()