Skip to content

Commit

Permalink
YJIT: Fix tailcall and JIT entry eating up FINISH frames
Browse files Browse the repository at this point in the history
Suppose YJIT runs a rb_vm_opt_send_without_block()
fallback and the control frame stack looks like:

```
will_tailcall_bar [FINISH]
caller_that_used_fallback
```

will_tailcall_bar() runs in the interpreter and sets up a tailcall.
Right before JIT_EXEC() in the `send` instruction, the stack will look like:

```
bar [FINISH]
caller_that_used_fallback
```

Previously, JIT_EXEC() ran bar() in JIT code, which caused the `FINISH`
flag to return to the interpreter instead of to the JIT code running
caller_that_used_fallback(), causing code to run twice and probably
crash. Recent flaky failures on CI about "each stub expects a particular
iseq" are probably due to leaving methods twice in
`test_optimizations.rb`.

Only run JIT code from the interpreter if a new frame is pushed.
  • Loading branch information
XrXr committed Jan 27, 2024
1 parent cb9a47f commit 342af04
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
11 changes: 11 additions & 0 deletions test/ruby/test_optimization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,17 @@ def one_plus_two
assert_equal(3, one_plus_two)
end

def test_tailcall_and_post_arg
tailcall(<<~RUBY)
def ret_const = :ok
def post_arg(_a = 1, _b) = ret_const
RUBY

# YJIT probably uses a fallback on the call to post_arg
assert_equal(:ok, post_arg(0))
end

def test_tailcall_interrupted_by_sigint
bug12576 = 'ruby-core:76327'
script = "#{<<-"begin;"}\n#{<<~'end;'}"
Expand Down
2 changes: 1 addition & 1 deletion vm_exec.h
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ default: \
// Run the JIT from the interpreter
#define JIT_EXEC(ec, val) do { \
rb_jit_func_t func; \
if (val == Qundef && (func = jit_compile(ec))) { \
if (val == Qundef && GET_CFP() != ec->cfp && (func = jit_compile(ec))) { \
val = func(ec, ec->cfp); \
RESTORE_REGS(); /* fix cfp for tailcall */ \
if (ec->tag->state) THROW_EXCEPTION(val); \
Expand Down

0 comments on commit 342af04

Please sign in to comment.