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

YJIT: End the block after OPTIMIZE_METHOD_TYPE_CALL (#13245)

Browse source
This commit is contained in:
Takashi Kokubun 2025-05-05 13:35:28 -07:00 • committed by GitHub
parent 4621feb677
commit cbf9c088f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
Notes: git 2025-05-05 20:35:51 +00:00 
Merged-By: k0kubun <takashikkbn@gmail.com>
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
test/-ext-/debug/test_debug.rb
View file

@ -75,4 +75,19 @@ class TestDebug < Test::Unit::TestCase
end
assert_equal true, x, '[Bug #15105]'
end
# This is a YJIT test, but we can't test this without a C extension that calls
# rb_debug_inspector_open(), so we're testing it using "-test-/debug" here.
def test_yjit_invalidates_setlocal_after_inspector_call
val = setlocal_after_proc_call(proc { Bug::Debug.inspector; :ok })
assert_equal :ok, val
end if defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
private
def setlocal_after_proc_call(block)
local = block.call # setlocal followed by OPTIMIZED_METHOD_TYPE_CALL
itself # split a block using a C call
local # getlocal
end
end

4
yjit/src/codegen.rs
View file

@ -9375,7 +9375,6 @@ fn gen_send_general(
}
OPTIMIZED_METHOD_TYPE_CALL => {
if block.is_some() {
gen_counter_incr(jit, asm, Counter::send_call_block);
return None;
@ -9427,8 +9426,9 @@ fn gen_send_general(
let stack_ret = asm.stack_push(Type::Unknown);
asm.mov(stack_ret, ret);
return Some(KeepCompiling);
// End the block to allow invalidating the next instruction
return jump_to_next_insn(jit, asm);
}
OPTIMIZED_METHOD_TYPE_BLOCK_CALL => {
gen_counter_incr(jit, asm, Counter::send_optimized_method_block_call);