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

merge revision(s) cbf9c088f8005a49b6aa3f475c70041357774c61: [Backport #21310]

Browse Source 
YJIT: End the block after OPTIMIZE_METHOD_TYPE_CALL (#13245)
This commit is contained in:
nagachika 2025-05-24 16:38:32 +09:00
parent 24c994b91a
commit 3809389984
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,4 +72,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

2
version.h
View File

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 155
#define RUBY_PATCHLEVEL 156
#include "ruby/version.h"
#include "ruby/internal/abi.h"

4
yjit/src/codegen.rs
View File

@ -7449,7 +7449,6 @@ fn gen_send_general(
}
OPTIMIZED_METHOD_TYPE_CALL => {
if block.is_some() {
gen_counter_incr(asm, Counter::send_call_block);
return None;
@ -7501,8 +7500,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(asm, Counter::send_optimized_method_block_call);