diff options
author | NARUSE, Yui <naruse@airemix.jp> | 2023-01-18 18:56:51 +0900 |
---|---|---|
committer | NARUSE, Yui <naruse@airemix.jp> | 2023-01-18 18:56:51 +0900 |
commit | 1fb5eb5740d4c4f1fc34a4a50bc0482eac27b545 (patch) | |
tree | 54be1f45b0e775d0478271d9ed492333db998312 | |
parent | f7e9b79f815e08e0a29fff11f77466f4ffb92520 (diff) |
merge revision(s) aeddc19340c7116d48fac3080553fbb823857d16: [Backport #19316]
YJIT: Save PC and SP before calling leaf builtins (#7090)
Previously, we did not update `cfp->sp` before calling the C function of
ISEQs marked with `Primitive.attr! "inline"` (leaf builtins). This
caused the GC to miss temporary values on the stack in case the function
allocates and triggers a GC run. Right now, there is only a few leaf
builtins in numeric.rb on Integer methods such as `Integer#~`. Since
these methods only allocate when operating on big numbers, we missed
this issue.
Fix by saving PC and SP before calling the functions -- our usual
protocol for calling C functions that may allocate on the GC heap.
[Bug #19316]
---
test/ruby/test_yjit.rb | 16 ++++++++++++++++
yjit/src/codegen.rs | 4 ++++
2 files changed, 20 insertions(+)
-rw-r--r-- | test/ruby/test_yjit.rb | 16 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | yjit/src/codegen.rs | 4 |
3 files changed, 21 insertions, 1 deletions
diff --git a/test/ruby/test_yjit.rb b/test/ruby/test_yjit.rb index 1a552a1074..6b6ea6619e 100644 --- a/test/ruby/test_yjit.rb +++ b/test/ruby/test_yjit.rb @@ -1042,6 +1042,22 @@ class TestYJIT < Test::Unit::TestCase RUBY end + def test_bug_19316 + n = 2 ** 64 + # foo's extra param and the splats are relevant + assert_compiles(<<~'RUBY', result: [[n, -n], [n, -n]]) + def foo(_, a, b, c) + [a & b, ~c] + end + + n = 2 ** 64 + args = [0, -n, n, n-1] + + GC.stress = true + [foo(*args), foo(*args)] + RUBY + end + private def code_gc_helpers @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 8 +#define RUBY_PATCHLEVEL 9 #include "ruby/version.h" #include "ruby/internal/abi.h" diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs index 0347f6fc89..bf68576d7c 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -5181,6 +5181,10 @@ fn gen_send_iseq( if builtin_argc + 1 < (C_ARG_OPNDS.len() as i32) { asm.comment("inlined leaf builtin"); + // Save the PC and SP because the callee may allocate + // e.g. Integer#abs on a bignum + jit_prepare_routine_call(jit, ctx, asm); + // Call the builtin func (ec, recv, arg1, arg2, ...) let mut args = vec![EC]; |