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]
This commit is contained in:
parent
6a585dbd5a
commit
aeddc19340
Notes:
git
2023-01-10 16:11:29 +00:00
Merged-By: maximecb <maximecb@ruby-lang.org>
@ -1042,6 +1042,22 @@ class TestYJIT < Test::Unit::TestCase
|
|||||||
RUBY
|
RUBY
|
||||||
end
|
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
|
private
|
||||||
|
|
||||||
def code_gc_helpers
|
def code_gc_helpers
|
||||||
|
@ -5181,6 +5181,10 @@ fn gen_send_iseq(
|
|||||||
if builtin_argc + 1 < (C_ARG_OPNDS.len() as i32) {
|
if builtin_argc + 1 < (C_ARG_OPNDS.len() as i32) {
|
||||||
asm.comment("inlined leaf builtin");
|
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, ...)
|
// Call the builtin func (ec, recv, arg1, arg2, ...)
|
||||||
let mut args = vec![EC];
|
let mut args = vec![EC];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user